From 3d7f3bbab7b81eebc71bb8ae646d1ffd9a2df073 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 5 Feb 2014 16:54:37 -0600 Subject: [PATCH] [libpng17] Deleted the other instance of "c = b;" which is the one that triggered a scan-build warning in pngrutil.c. --- ANNOUNCE | 4 +++- CHANGES | 4 +++- pngrutil.c | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 07b3f48d3..0041991fa 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -521,7 +521,9 @@ Version 1.7.0beta31 [February 5, 2014] application errors or crashes. Such chunks are now skipped (with chunk_benign_error). Restored a line, "c = b;", that was inadvertently deleted from the - PAETH filtering code from libpng-1.7.0beta24/pngrutil.c. + PAETH filtering code from libpng-1.7.0beta24/pngrutil.c. Deleted + the other instance of "c = b;" which is the one that triggered a + scan-build warning. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 2c16f9ce5..e04b8f0c3 100644 --- a/CHANGES +++ b/CHANGES @@ -4810,7 +4810,9 @@ Version 1.7.0beta31 [February 5, 2014] application errors or crashes. Such chunks are now skipped (with chunk_benign_error). Restored a line, "c = b;", that was inadvertently deleted from the - PAETH filtering code from libpng-1.7.0beta24/pngrutil.c. + PAETH filtering code from libpng-1.7.0beta24/pngrutil.c. Deleted + the other instance of "c = b;" which is the one that triggered a + scan-build warning. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngrutil.c b/pngrutil.c index 3140ec050..0769ed1cc 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -3856,7 +3856,6 @@ png_read_filter_row_paeth_multibyte_pixel(png_row_infop row_info, png_bytep row, if (pb < pa) pa = pb, a = b; if (pc < pa) a = c; - c = b; a += *row; *row++ = (png_byte)a; }