From 0d410fc2d2642b60c79e8b3fc9fec55e5f4e2934 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Fri, 6 Mar 2015 09:28:34 +0100
Subject: [PATCH] more after patch fixes

---
 ext/fileinfo/libmagic/apprentice.c |  3 ++-
 ext/fileinfo/libmagic/readcdf.c    |  2 +-
 ext/fileinfo/libmagic/softmagic.c  | 15 +++++----------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
index 22899b31f7..5e843faba9 100644
--- a/ext/fileinfo/libmagic/apprentice.c
+++ b/ext/fileinfo/libmagic/apprentice.c
@@ -447,7 +447,8 @@ apprentice_1(struct magic_set *ms, const char *fn, int action)
 
 	if (action == FILE_LIST) {
 		for (i = 0; i < MAGIC_SETS; i++) {
-			printf("Set " SIZE_T_FORMAT ":\nBinary patterns:\n",i);
+			printf("Set %" SIZE_T_FORMAT "u:\nBinary patterns:\n",
+			    i);
 			apprentice_list(ms->mlist[i], BINTEST);
 			printf("Text patterns:\n");
 			apprentice_list(ms->mlist[i], TEXTTEST);
diff --git a/ext/fileinfo/libmagic/readcdf.c b/ext/fileinfo/libmagic/readcdf.c
index 5c4be2cc69..0fb028380e 100644
--- a/ext/fileinfo/libmagic/readcdf.c
+++ b/ext/fileinfo/libmagic/readcdf.c
@@ -107,7 +107,7 @@ static const struct cv {
 	},
 	{	{ 0,			 0			},
 		NULL,
-	}
+	},
 };
 
 private const char *
diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
index 9aaea49b32..d11eba3816 100644
--- a/ext/fileinfo/libmagic/softmagic.c
+++ b/ext/fileinfo/libmagic/softmagic.c
@@ -636,7 +636,7 @@ mprint(struct magic_set *ms, struct magic *m)
 		}
 		rval = file_printf(ms, F(ms, m, "%s"),
 		    file_printable(sbuf, sizeof(sbuf), cp));
-		free(cp);
+		efree(cp);
 
 		if (rval == -1)
 			return -1;
@@ -1089,13 +1089,8 @@ mcopy(struct magic_set *ms, union VALUETYPE *p, int type, int indir,
 				return 0;
 			}
 
-			if (m->str_flags & REGEX_LINE_COUNT) {
-				linecnt = m->str_range;
-				bytecnt = linecnt * 80;
-			} else {
-				linecnt = 0;
-				bytecnt = m->str_range;
-			}
+			linecnt = m->str_range;
+			bytecnt = linecnt * 80;
 
 			if (bytecnt == 0 || bytecnt > nbytes - offset)
 				bytecnt = nbytes - offset;
@@ -1667,11 +1662,11 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
 				return -1;
 			}
 			if (file_printf(ms, "%s", rbuf) == -1) {
-				if (rbuf) free(rbuf);
+				if (rbuf) efree(rbuf);
 				return -1;
 			}
 		}
-		if (rbuf) free(rbuf);
+		if (rbuf) efree(rbuf);
 		return rv;
 
 	case FILE_USE:
-- 
2.50.1