[CVE-2018-14553] Fix potential NULL pointer dereference in gdImageClone()

https://github.com/libgd/libgd/commit/a93eac0e843148dc2d631c3ba80af17e9c8c860f

Change-Id: Ie7339ccad3475ca5e5ee2535217f1474b88108e7

diff --git a/deps/libmscgen/gd.c b/deps/libmscgen/gd.c
index a9a8aa6..7176783 100644 (file)
--- a/deps/libmscgen/gd.c
+++ b/deps/libmscgen/gd.c
@@ -2855,14 +2855,6 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) {
                }
        }
 
-       if (src->styleLength > 0) {
-               dst->styleLength = src->styleLength;
-               dst->stylePos    = src->stylePos;
-               for (i = 0; i < src->styleLength; i++) {
-                       dst->style[i] = src->style[i];
-               }
-       }
-
        dst->interlace   = src->interlace;
 
        dst->alphaBlendingFlag = src->alphaBlendingFlag;
@@ -2897,6 +2889,7 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) {
 
        if (src->style) {
                gdImageSetStyle(dst, src->style, src->styleLength);
+        dst->stylePos = src->stylePos;
        }
 
        for (i = 0; i < gdMaxColors; i++) {