From: Thies C. Arntzen <thies@php.net>
Date: Tue, 14 Dec 1999 04:32:54 +0000 (+0000)
Subject: (getimagesize) grrr, fixed newly (30 min ago) introduced NPR
X-Git-Tag: PRE_RETURN_REF_MERGE~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1cad06afdadc426ecc0b4389bc7d92449422d623;p=php

(getimagesize) grrr, fixed newly (30 min ago) introduced NPR
---

diff --git a/ext/standard/image.c b/ext/standard/image.c
index 4749f03ec8..5c1578faf6 100644
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -347,7 +347,11 @@ PHP_FUNCTION(getimagesize)
 		result = php3_handle_gif (fp);
 		itype = 1;
 	} else if (!memcmp(filetype, php3_sig_jpg, 3)) {
-		result = php3_handle_jpeg(fp,*info);
+		if (info) {
+			result = php3_handle_jpeg(fp,*info);
+		} else {
+			result = php3_handle_jpeg(fp,NULL);
+		}
 		itype = 2;
 	} else if (!memcmp(filetype, php3_sig_png, 3)) {
 		fseek(fp, 0L, SEEK_SET);