Changes in uspace/lib/c/generic/rtld/symbol.c [ca0e838:da54714] in mainline

File:

• uspace/lib/c/generic/rtld/symbol.c (modified) (3 diffs)

uspace/lib/c/generic/rtld/symbol.c

@@ -65 +65 @@
 static elf_symbol_t *def_find_in_module(const char *name, module_t *m)
 {
+        if (m->dyn.hash == NULL) {
+                /* No hash table */
+                return NULL;
+        }
+
         elf_symbol_t *sym_table;
         elf_symbol_t *s, *sym;
         elf_word nbucket;
-        /*elf_word nchain;*/
+        /* elf_word nchain; */
         elf_word i;
         char *s_name;
@@ -77 +82 @@
         sym_table = m->dyn.sym_tab;
         nbucket = m->dyn.hash[0];
-        /*nchain = m->dyn.hash[1]; XXX Use to check HT range*/
+        /* nchain = m->dyn.hash[1]; XXX Use to check HT range */
 
         bucket = elf_hash((unsigned char *)name) % nbucket;
@@ -135 +140 @@
         modules_untag(start->rtld);
 
-        /* Insert root (the program) into the queue and tag it */
+        /*
+         * Insert root (the program) into the queue and tag it.
+         *
+         * We disable the dangling-pointer warning because the compiler incorrectly
+         * assumes that we leak local address (queue) to a parent scope (to start
+         * argument). However, we always empty the list so the pointer cannot
+         * actually escape. Probably the compiler can never statically analyze that
+         * correctly.
+         */
         list_initialize(&queue);
         start->bfs_tag = true;
+#pragma GCC diagnostic push
+#if defined(__GNUC__) && (__GNUC__ >= 12)
+#pragma GCC diagnostic ignored "-Wdangling-pointer"
+#endif
         list_append(&start->queue_link, &queue);
+#pragma GCC diagnostic pop
 
         /* If the symbol is found, it will be stored in 'sym' */