[GNUnet-SVN] [libextractor] 08/27: fix potential buffer underflow read in deb_extractor

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository libextractor.

commit 71aa4223b2770a9243ddc86457bcd2fdcf47d922
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Oct 15 19:59:51 2017 +0200

    fix potential buffer underflow read in deb_extractor
---
 ChangeLog                   | 3 ++-
 src/plugins/deb_extractor.c | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 82c4262b..1a2fb983 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,8 @@ Sun Oct 15 19:36:41 CEST 2017
        Fix potential assign-after-free (on IPC error handling path).
        Make sure to only pass "unsigned char" to functions like isspace().
        Avoid malloc(0) in DEB extractor under certain conditions.
-       Properly initialize 'duration' in ffmpeg extractor. -CG
+       Properly initialize 'duration' in ffmpeg extractor.
+       Fix potential buffer underflow read in DEB extractor. -CG
 
 Fri Oct 13 12:30:37 CEST 2017
        Properly check read error in NSF plugin (from signedness confusion) 
found by Leon Zhao. -CG
diff --git a/src/plugins/deb_extractor.c b/src/plugins/deb_extractor.c
index afbe8bb5..2eb00280 100644
--- a/src/plugins/deb_extractor.c
+++ b/src/plugins/deb_extractor.c
@@ -365,6 +365,8 @@ processControlTGZ (struct EXTRACTOR_ExtractContext *ec,
     return 0;
   if (0 == size)
     return 0;
+  if (size < 4)
+    return 0;
   if (NULL == (cdata = malloc (size)))
     return 0;
   off = 0;
@@ -375,7 +377,9 @@ processControlTGZ (struct EXTRACTOR_ExtractContext *ec,
          free (cdata);
          return 0;
        }
-      memcpy (&cdata[off], data, sret);
+      memcpy (&cdata[off],
+              data,
+              sret);
       off += sret;
     }
   bufSize = cdata[size - 4] + (cdata[size - 3] << 8) + (cdata[size - 2] << 16) 
+ (cdata[size - 1] << 24);

-- 
To stop receiving notification emails like this one, please contact
address@hidden