]> granicus.if.org Git - php/commitdiff
(getimagesize) grrr, fixed newly (30 min ago) introduced NPR
authorThies C. Arntzen <thies@php.net>
Tue, 14 Dec 1999 04:32:54 +0000 (04:32 +0000)
committerThies C. Arntzen <thies@php.net>
Tue, 14 Dec 1999 04:32:54 +0000 (04:32 +0000)
ext/standard/image.c

index 4749f03ec8f4cfb73b9256cb5082ccf7aa576d92..5c1578faf6cd95c3950b5c5afd67c186e5599bb0 100644 (file)
@@ -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);