Changeset 3fbce97 for lib/ini.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (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 branch 'master' into parson

File:

• lib/ini.c (modified) (1 diff)

lib/ini.c

@@ -28 +28 @@
 ini_t *ini_open(char *file)
 {
-        int fd;
+        int fd = -1;
         ini_t *ini = NULL;
         struct stat fi;
 
-        if ((fd = open(file, O_RDONLY)) != -1 &&
+        if (file && (fd = open(file, O_RDONLY)) != -1 &&
             fstat(fd, &fi) == 0 &&
             fi.st_size <= 16384 &&