From: Cristy <urban-warrior@imagemagick.org>
Date: Tue, 23 Jan 2018 00:21:39 +0000 (-0500)
Subject: Eliminate uninitialized value
X-Git-Tag: 7.0.7-23~303
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82c58c138e2ffc1f170db711b07627ee621c2a22;p=imagemagick

Eliminate uninitialized value
Credit OSS Fuzz
---

diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c
index bab8f7c12..93b22c5d3 100644
--- a/MagickCore/xml-tree.c
+++ b/MagickCore/xml-tree.c
@@ -1484,23 +1484,26 @@ static char *ParseEntities(char *xml,char **entities,int state)
                     offset=(ssize_t) (xml-p);
                     extent=(size_t) (offset+length+strlen(entity));
                     if (p != q)
-                      p=(char *) ResizeQuantumMemory(p,extent+1,sizeof(*p));
+                      p=(char *) ResizeQuantumMemory(p,extent,sizeof(*p));
                     else
                       {
                         char
                           *extent_xml;
 
-                        extent_xml=(char *) AcquireQuantumMemory(extent+1,
+                        extent_xml=(char *) AcquireQuantumMemory(extent,
                           sizeof(*extent_xml));
                         if (extent_xml != (char *) NULL)
-                          (void) CopyMagickString(extent_xml,p,extent*
-                            sizeof(*extent_xml));
+                          {
+                            ResetMagickMemory(extent_xml,0,extent*
+                              sizeof(*extent_xml));
+                            (void) CopyMagickString(extent_xml,p,extent*
+                              sizeof(*extent_xml));
+                          }
                         p=extent_xml;
                       }
                     if (p == (char *) NULL)
                       ThrowFatalException(ResourceLimitFatalError,
                         "MemoryAllocationFailed");
-                    p[extent]='\0';
                     xml=p+offset;
                     entity=strchr(xml,';');
                   }