[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libextractor] 20/27: fix signed/unsigned comparison issue
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libextractor] 20/27: fix signed/unsigned comparison issue |
Date: |
Sun, 15 Oct 2017 21:34:44 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository libextractor.
commit d9d073c66b49b91403484e081eda39d4e5c17cc2
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Oct 15 20:46:58 2017 +0200
fix signed/unsigned comparison issue
---
src/main/extractor_datasource.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/extractor_datasource.c b/src/main/extractor_datasource.c
index 8b4c6113..888e524a 100644
--- a/src/main/extractor_datasource.c
+++ b/src/main/extractor_datasource.c
@@ -462,6 +462,7 @@ cfs_init_decompressor_zlib (struct CompressedFileSource
*cfs,
{
unsigned int gzip_header_length = 10;
unsigned char hdata[12];
+ ssize_t rsize;
if (0 != bfds_seek (cfs->bfds, 0, SEEK_SET))
{
@@ -469,7 +470,9 @@ cfs_init_decompressor_zlib (struct CompressedFileSource
*cfs,
return -1;
}
/* Process gzip header */
- if (sizeof (hdata) > bfds_read (cfs->bfds, hdata, sizeof (hdata)))
+ rsize = bfds_read (cfs->bfds, hdata, sizeof (hdata));
+ if ( (-1 == rsize) ||
+ (sizeof (hdata) > (size_t) rsize) )
return -1;
if (0 != (hdata[3] & 0x4)) /* FEXTRA set */
gzip_header_length += 2 + (hdata[10] & 0xff) + ((hdata[11] & 0xff) * 256);
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [libextractor] 16/27: handle allocation failure in gstreamer plugin, (continued)
- [GNUnet-SVN] [libextractor] 16/27: handle allocation failure in gstreamer plugin, gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 11/27: be more conservative about result from ctime_r, gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 14/27: add missing continue if max meta data was reached to avoid use after free, gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 15/27: fix indentation, gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 06/27: fix duration initialization in ffmpeg extractor (badly positioned #if), gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 13/27: seems some specs of c_time allow up to 71 bytes, so increase buffer size just to be safe, gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 19/27: need isspace, not isblank for rpm extractor, gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 17/27: handle allocation failure in PDF fdopen call, gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 18/27: do not try to seek on SHM if we do not use SHM, even if (bad) plugin requests it, gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 10/27: be more careful with memory allocation failures in gsf extractor, avoid calling g_free(NULL), gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 20/27: fix signed/unsigned comparison issue,
gnunet <=
- [GNUnet-SVN] [libextractor] 21/27: handle IPC_shared_memory_set_ error, gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 25/27: avoid NPE on empty value in grep-friendly printing, gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 12/27: fix NPE in extract for 0-byte values, gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 07/27: doxygen improvements, gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 26/27: check return values from dup2(), gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 22/27: remove useless assignment, gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 24/27: avoid calling free(NULL) on plugin load error, gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 27/27: update gitignore, gnunet, 2017/10/15
- [GNUnet-SVN] [libextractor] 23/27: extra-carefully check return value of snprintf, gnunet, 2017/10/15