Changeset 967:bbc08d58325a in freeDiameter

Timestamp:

Mar 10, 2013, 5:57:57 PM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Parents:

964:992ef1167344 (diff), 937:6e7437162f26 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

merge

File:

• libfdcore/fdd.y (modified) (1 diff)

libfdcore/fdd.y

@@ -323 +323 @@
                                                 { yyerror (&yylloc, conf, "Not enough memory"); YYERROR; } );
                                         sprintf(fname, DEFAULT_EXTENSIONS_PATH "/%s", bkp);
-                                        free(bkp);
                                         fd = fopen(fname, "r");
-                                }
-                                if (fd == NULL) {
-                                        int ret = errno;
-                                        TRACE_DEBUG_ERROR("WARNING: Unable to open extension file %s for reading: %s\nLD_LIBRARY_PATH will be used.\n", fname, strerror(ret));
-                                } else {
+                                        if (fd == NULL) {
+                                                free(fname);
+                                                fname = bkp;
+                                        } else {
+                                                free(bkp);
+                                        }
+                                }
+                                if (fd != NULL) {
                                         fclose(fd);
-                                }
+                                } /* otherwise, LD_LIBRARY_PATH will be tested by dl_open. 
+                                This should not give any security issue, otherwise we can add an "else fail" here. */
                                 
                                 /* Try and open the configuration file (optional) */