backport this piece from 5.6, related to the #66307 fix

esr2587758 · Apr 24, 2014 · d7bb09c · d7bb09c
1 parent 03fa550
commit d7bb09c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/ext/fileinfo/libmagic/readcdf.c b/ext/fileinfo/libmagic/readcdf.c
@@ -149,7 +149,8 @@ cdf_file_property_info(struct magic_set *ms, const cdf_property_info_t *info,
 											return -1;
 										}
                                         c = cdf_ctime(&sec, tbuf);
-                                        if ((ec = strchr(c, '\n')) != NULL)
+                                        if (c != NULL &&
+					    (ec = strchr(c, '\n')) != NULL)
                                                 *ec = '\0';
 
                                         if (NOTMIME(ms) && file_printf(ms,