From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 15 Apr 2019 08:59:45 +0000 (+0200)
Subject: Avoid maybe uninit warning in libmagic
X-Git-Tag: php-7.4.0alpha1~497
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=908660c1d778186f661d97c7051c8f2891e2e602;p=php

Avoid maybe uninit warning in libmagic

GCC 5 false positive, gone in newer versions.
---

diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch
index 6aa369bd05..522bbcc71b 100644
--- a/ext/fileinfo/libmagic.patch
+++ b/ext/fileinfo/libmagic.patch
@@ -1,6 +1,6 @@
 diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
 --- libmagic.orig/apprentice.c	2018-03-11 01:46:42.000000000 +0100
-+++ libmagic/apprentice.c	2019-04-12 10:04:15.721646341 +0200
++++ libmagic/apprentice.c	2019-04-15 10:57:47.115181746 +0200
 @@ -2,7 +2,7 @@
   * Copyright (c) Ian F. Darwin 1986-1995.
   * Software written by Ian F. Darwin and others;
@@ -945,7 +945,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
 -	int fd;
 -	struct stat st;
 +	uint32_t *ptr;
-+	uint32_t version, entries, nentries;
++	uint32_t version, entries = 0, nentries;
 +	int needsbyteswap;
  	char *dbname = NULL;
  	struct magic_map *map;
diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
index 3355d3cc1e..b9bb65898c 100644
--- a/ext/fileinfo/libmagic/apprentice.c
+++ b/ext/fileinfo/libmagic/apprentice.c
@@ -2954,7 +2954,7 @@ private struct magic_map *
 apprentice_map(struct magic_set *ms, const char *fn)
 {
 	uint32_t *ptr;
-	uint32_t version, entries, nentries;
+	uint32_t version, entries = 0, nentries;
 	int needsbyteswap;
 	char *dbname = NULL;
 	struct magic_map *map;