From 0ded90eff979c0a329736861995b2516139de114 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Mon, 14 Sep 2009 01:31:46 +0000 Subject: fix problems or otherwise improve code based on issues raised by Klocwork git-svn-id: svn+q:///qpdf/trunk@690 71b93d88-0707-0410-a8cf-f5a4172ac649 --- libqpdf/QPDF_linearization.cc | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'libqpdf/QPDF_linearization.cc') diff --git a/libqpdf/QPDF_linearization.cc b/libqpdf/QPDF_linearization.cc index 2a81856e..281748b5 100644 --- a/libqpdf/QPDF_linearization.cc +++ b/libqpdf/QPDF_linearization.cc @@ -113,19 +113,17 @@ QPDF::isLinearized() } else { - if ((p = (char*)memchr(p, '\0', tbuf_size - (p - buf))) != 0) + p = (char*)memchr(p, '\0', tbuf_size - (p - buf)); + assert(p != 0); + while ((p - buf < tbuf_size) && (*p == 0)) { - QTC::TC("qpdf", "QPDF lindict null found"); - while ((p - buf < tbuf_size) && (*p == 0)) - { - ++p; - } - if ((p - buf) == tbuf_size) - { - break; - } - QTC::TC("qpdf", "QPDF lindict searching after null"); + ++p; + } + if ((p - buf) == tbuf_size) + { + break; } + QTC::TC("qpdf", "QPDF lindict searching after null"); } } -- cgit v1.2.3-54-g00ecf