Fix bug #72407: NULL Pointer Dereference at _gdScaleVert

smalyshev · smalyshev · commit b9ec171e7d25 · 2016-06-18T21:57:25.000-07:00
diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c
@@ -1049,6 +1049,9 @@ static inline void _gdScaleVert (const gdImagePtr pSrc, const unsigned int src_w
 	}
 
 	contrib = _gdContributionsCalc(dst_height, src_height, (double)(dst_height) / (double)(src_height), pSrc->interpolation);
+	if (contrib == NULL) {
+		return;
+	}
 	/* scale each column */
 	for (u = 0; u < dst_width - 1; u++) {
 		_gdScaleCol(pSrc, src_width, pDst, dst_width, dst_height, u, contrib);

Original file line number	Diff line number	Diff line change
`@@ -1049,6 +1049,9 @@ static inline void _gdScaleVert (const gdImagePtr pSrc, const unsigned int src_w`
`1049`	`1049`	`}`
`1050`	`1050`
`1051`	`1051`	`contrib = _gdContributionsCalc(dst_height, src_height, (double)(dst_height) / (double)(src_height), pSrc->interpolation);`
	`1052`	`+ if (contrib == NULL) {`
	`1053`	`+ return;`
	`1054`	`+ }`
`1052`	`1055`	`/* scale each column */`
`1053`	`1056`	`for (u = 0; u < dst_width - 1; u++) {`
`1054`	`1057`	`_gdScaleCol(pSrc, src_width, pDst, dst_width, dst_height, u, contrib);`