diff options
| author | Thies C. Arntzen <thies@php.net> | 1999-12-14 04:32:54 +0000 |
|---|---|---|
| committer | Thies C. Arntzen <thies@php.net> | 1999-12-14 04:32:54 +0000 |
| commit | 1cad06afdadc426ecc0b4389bc7d92449422d623 (patch) | |
| tree | 0e5f80b148a011a5f62d0e0f0a4a414fb78607f5 /ext/standard/image.c | |
| parent | ad764253cada0c0e501b68773b0b03d32e532f69 (diff) | |
| download | php-git-1cad06afdadc426ecc0b4389bc7d92449422d623.tar.gz | |
(getimagesize) grrr, fixed newly (30 min ago) introduced NPR
Diffstat (limited to 'ext/standard/image.c')
| -rw-r--r-- | ext/standard/image.c | 6 |
1 files changed, 5 insertions, 1 deletions
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); |