From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 14 Apr 2015 12:35:33 +0000 (+0300)
Subject: Partial revert of 1a7798c786466977ef8d2bc95b40a435c47c845a that introduced wrong... 
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~311
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=753fa0c593aa9be8ca749b2dc8b8999f587f5784;p=php

Partial revert of 1a7798c786466977ef8d2bc95b40a435c47c845a that introduced wrong memory access
---

diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
index e08d167f9e..3fd30ff42c 100644
--- a/ext/fileinfo/libmagic/softmagic.c
+++ b/ext/fileinfo/libmagic/softmagic.c
@@ -624,7 +624,6 @@ mprint(struct magic_set *ms, struct magic *m)
 		t = ms->offset + sizeof(double);
   		break;
 
-	case FILE_SEARCH:
 	case FILE_REGEX: {
 		char *cp;
 		int rval;
@@ -648,6 +647,15 @@ mprint(struct magic_set *ms, struct magic *m)
 		break;
 	}
 
+	case FILE_SEARCH:
+		if (file_printf(ms, F(ms, m, "%s"), m->value.s) == -1)
+			return -1;
+		if ((m->str_flags & REGEX_OFFSET_START))
+			t = ms->search.offset;
+		else
+			t = ms->search.offset + m->vallen;
+		break;
+
 	case FILE_DEFAULT:
 	case FILE_CLEAR:
 	  	if (file_printf(ms, "%s", m->desc) == -1)