diff options
| author | Anatol Belski <ab@php.net> | 2016-08-03 18:26:29 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-08-03 18:26:29 +0200 |
| commit | 9667ee4f72c7dafce993b71104a52beb7c3aff15 (patch) | |
| tree | 4fc50c38bc6b658403228abf9b1f80b1e3877098 | |
| parent | f15c1553635ccb33c5f24d8ffe7a1cd05de5fe91 (diff) | |
| download | php-git-9667ee4f72c7dafce993b71104a52beb7c3aff15.tar.gz | |
improve the check, avoid strlen on NULL
| -rw-r--r-- | ext/exif/exif.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 94652e909b..f95de3a14f 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -1708,11 +1708,11 @@ static void exif_iif_add_value(image_info_type *image_info, int section_index, c if (!length) break; case TAG_FMT_UNDEFINED: - if (tag == TAG_MAKER_NOTE) { - length = MIN(length, strlen(value)); - } - if (value) { + if (tag == TAG_MAKER_NOTE) { + length = MIN(length, strlen(value)); + } + /* do not recompute length here */ info_value->s = estrndup(value, length); info_data->length = length; |