Skip to content

Local code intelligence for developers and AI agents. Connect code, docs and infrastructure in a persistent graph, with CBM Lens, MCP tools, agent integrations and change-aware test selection.

fix(discover): a short file name is read no further than its end

Martin Vogel2522a06c6db3
diff --git a/src/discover/language.c b/src/discover/language.c
index a9a6d5b36..520416493 100644
--- a/src/discover/language.c
+++ b/src/discover/language.c
@@ -983,9 +983,12 @@ static bool lang_dockerfile_variant(const cbm_userconfig_t *ucfg, const char *fi
static const char DOCKERIGNORE[] = ".dockerignore";
for (size_t i = 0; i < sizeof(BASES) / sizeof(BASES[0]); i++) {
size_t bl = strlen(BASES[i]);
+ /* the base first: only a name that holds it has a character after it */
+ if (strncmp(filename, BASES[i], bl) != 0) {
+ continue;
+ }
char sep = filename[bl];
- if (strncmp(filename, BASES[i], bl) != 0 || (sep != '.' && sep != '-' && sep != '_') ||
- !filename[bl + SKIP_ONE]) {
+ if ((sep != '.' && sep != '-' && sep != '_') || !filename[bl + SKIP_ONE]) {
continue;
}
size_t fl = strlen(filename);
diff --git a/tests/test_language.c b/tests/test_language.c
index 5bc7b18d5..6dc2c0d22 100644
--- a/tests/test_language.c
+++ b/tests/test_language.c
@@ -564,6 +564,24 @@ TEST(lang_fn_dockerfile_variants) {
ASSERT_NEQ(cbm_language_for_filename("Dockerfiles"), CBM_LANG_DOCKERFILE);
PASS();
}
+/* A name shorter than "Dockerfile" / "Containerfile" is read no further than
+ * its end: each name sits in a heap block of exactly its size, so a sanitizer
+ * sees the overread the variant check once made (GCC ASan, doc-link code
+ * asking for the language of `a.go`). */
+TEST(lang_fn_short_names_read_in_bounds) {
+ static const char *const NAMES[] = {"a", "a.go", "go.mod", "Dock",
+ "Dockerf", "Containe", "x.yaml"};
+ for (size_t i = 0; i < sizeof(NAMES) / sizeof(NAMES[0]); i++) {
+ size_t n = strlen(NAMES[i]) + 1;
+ char *exact = malloc(n);
+ ASSERT_NOT_NULL(exact);
+ memcpy(exact, NAMES[i], n);
+ CBMLanguage lang = cbm_language_for_filename(exact);
+ free(exact);
+ ASSERT_NEQ(lang, CBM_LANG_DOCKERFILE);
+ }
+ PASS();
+}
TEST(lang_fn_meson_build) {
ASSERT_EQ(cbm_language_for_filename("meson.build"), CBM_LANG_MESON);
PASS();
@@ -1651,6 +1669,7 @@ SUITE(language) {
RUN_TEST(lang_fn_cmake);
RUN_TEST(lang_fn_dockerfile);
RUN_TEST(lang_fn_dockerfile_variants);
+ RUN_TEST(lang_fn_short_names_read_in_bounds);
RUN_TEST(lang_fn_meson_build);
RUN_TEST(lang_fn_meson_opts);
RUN_TEST(lang_fn_meson_opts_txt);