From: Remi Collet <remi@php.net>
Date: Tue, 10 Jun 2014 12:02:36 +0000 (+0200)
Subject: Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string... 
X-Git-Tag: php-5.3.29RC1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6bd5a06894fa2f8c1b53bf92fb809d911b740e84;p=php

Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size

Upstream
https://github.com/file/file/commit/27a14bc7ba285a0a5ebfdb55e54001aa11932b08
---

diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
index f9c2836dd2..e598981839 100644
--- a/ext/fileinfo/libmagic/softmagic.c
+++ b/ext/fileinfo/libmagic/softmagic.c
@@ -777,10 +777,18 @@ mconvert(struct magic_set *ms, struct magic *m)
 		return 1;
 	}
 	case FILE_PSTRING: {
-		char *ptr1 = p->s, *ptr2 = ptr1 + file_pstring_length_size(m);
+		size_t sz = file_pstring_length_size(m);
+		char *ptr1 = p->s, *ptr2 = ptr1 + sz;
 		size_t len = file_pstring_get_length(m, ptr1);
-		if (len >= sizeof(p->s))
-			len = sizeof(p->s) - 1;
+		if (len >= sizeof(p->s)) {
+			/*
+			 * The size of the pascal string length (sz)
+			 * is 1, 2, or 4. We need at least 1 byte for NUL
+			 * termination, but we've already truncated the
+			 * string by p->s, so we need to deduct sz.
+			 */ 
+			len = sizeof(p->s) - sz;
+		}
 		while (len--)
 			*ptr1++ = *ptr2++;
 		*ptr1 = '\0';