From a1296131fe9fb81af506799aa597e09ff31000a4 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 22 May 2016 14:42:14 -0500 Subject: [PATCH] [libpng17] Refactored duplicate coded in png_set_check_for_invalid_index() to quiet a Coverity issue and save a few bytes of code. --- pngtrans.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/pngtrans.c b/pngtrans.c index 291987ab1..65828921a 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -834,30 +834,26 @@ png_set_check_for_invalid_index(png_structrp png_ptr, int enabled) { if (png_ptr->read_struct) { -# ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED - if (enabled > 0) - png_ptr->palette_index_check = PNG_PALETTE_CHECK_ON; - else if (enabled < 0) - png_ptr->palette_index_check = PNG_PALETTE_CHECK_OFF; - else - png_ptr->palette_index_check = PNG_PALETTE_CHECK_DEFAULT; -# else /* !READ_CHECK_FOR_INVALID_INDEX */ +# ifndef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED png_app_error(png_ptr, "no read palette check support"); + return; # endif /* !READ_CHECK_FOR_INVALID_INDEX */ } + else /* write struct */ { -# ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED - if (enabled > 0) - png_ptr->palette_index_check = PNG_PALETTE_CHECK_ON; - else if (enabled < 0) - png_ptr->palette_index_check = PNG_PALETTE_CHECK_OFF; - else - png_ptr->palette_index_check = PNG_PALETTE_CHECK_DEFAULT; -# else /* !WRITE_CHECK_FOR_INVALID_INDEX */ +# ifndef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED png_app_error(png_ptr, "no write palette check support"); + return; # endif /* !WRITE_CHECK_FOR_INVALID_INDEX */ } + + if (enabled > 0) + png_ptr->palette_index_check = PNG_PALETTE_CHECK_ON; + else if (enabled < 0) + png_ptr->palette_index_check = PNG_PALETTE_CHECK_OFF; + else + png_ptr->palette_index_check = PNG_PALETTE_CHECK_DEFAULT; } } #endif /* CHECK_FOR_INVALID_INDEX */