cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libpng16] Undo failed attempt to debug UMR in png_set_text_2().

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2017-09-13 19:34:51 -05:00
parent 7d40b53fbf
commit d7edcc40e4
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pngset.c
View File

@ -837,9 +837,6 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,
size_t lang_len, lang_key_len; size_t lang_len, lang_key_len;
png_textp textp = &(info_ptr->text[info_ptr->num_text]); png_textp textp = &(info_ptr->text[info_ptr->num_text]);
int text_is_null=0;
int text_0_is_0=0;
if (text_ptr[i].key == NULL) if (text_ptr[i].key == NULL)
continue; continue;
@ -884,13 +881,8 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,
} }
# endif # endif
if (text_ptr[i].text == NULL) /* oss-fuzz complains of UMR here */
text_is_null=1; if (text_ptr[i].text == NULL || text_ptr[i].text[0] == '\0')
else if (text_ptr[i].text[0] == '\0') /* FIX THIS */
text_0_is_0=1;
/* oss-fuzz complains of UMR on the reference to text_0_is_0 */
if (text_is_null || text_0_is_0)
{ {
text_length = 0; text_length = 0;
# ifdef PNG_iTXt_SUPPORTED # ifdef PNG_iTXt_SUPPORTED