Changeset 5c90e3e in mainline for uspace/srv/logger/logs.c

Timestamp:

2012-10-18T22:38:27Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

508fff8

Parents:

b801f2d (diff), 7d248e3 (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.

Message:

merge mainline changes

File:

• uspace/srv/logger/logs.c (modified) (1 diff)

uspace/srv/logger/logs.c

@@ -268 +268 @@
 
         if (log->parent == NULL) {
-                fclose(log->dest->logfile);
+                /*
+                 * Due to lazy file opening in write_to_log(),
+                 * it is possible that no file was actually opened.
+                 */
+                if (log->dest->logfile != NULL) {
+                        fclose(log->dest->logfile);
+                }
                 free(log->dest->filename);
                 free(log->dest);