diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2012-07-08 17:01:13 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2012-07-08 17:01:13 -0700 |
| commit | fb4e0599a5ddaef9eee726f786b9edef4943432b (patch) | |
| tree | 6d73ba36fb267af597838d85cae86ca8188014f1 /examples | |
| parent | aef4174dd2b95029e29e004f4d4cae684d396033 (diff) | |
| download | zlib-fb4e0599a5ddaef9eee726f786b9edef4943432b.tar.gz | |
Fix argument checks in gzlog_compress() and gzlog_write().
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/gzlog.c | 10 | ||||
| -rw-r--r-- | examples/gzlog.h | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/examples/gzlog.c b/examples/gzlog.c index d70aaca..de32058 100644 --- a/examples/gzlog.c +++ b/examples/gzlog.c @@ -1,8 +1,8 @@ /* * gzlog.c - * Copyright (C) 2004, 2008 Mark Adler, all rights reserved + * Copyright (C) 2004, 2008, 2012 Mark Adler, all rights reserved * For conditions of distribution and use, see copyright notice in gzlog.h - * version 2.0, 25 Apr 2008 + * version 2.1, 8 Jul 2012 */ /* @@ -913,7 +913,7 @@ int gzlog_compress(gzlog *logd) struct log *log = logd; /* check arguments */ - if (log == NULL || strcmp(log->id, LOGID) || len < 0) + if (log == NULL || strcmp(log->id, LOGID)) return -3; /* see if we lost the lock -- if so get it again and reload the extra @@ -997,9 +997,9 @@ int gzlog_write(gzlog *logd, void *data, size_t len) struct log *log = logd; /* check arguments */ - if (log == NULL || strcmp(log->id, LOGID) || len < 0) + if (log == NULL || strcmp(log->id, LOGID)) return -3; - if (data == NULL || len == 0) + if (data == NULL || len <= 0) return 0; /* see if we lost the lock -- if so get it again and reload the extra diff --git a/examples/gzlog.h b/examples/gzlog.h index c461426..4e093bc 100644 --- a/examples/gzlog.h +++ b/examples/gzlog.h @@ -1,6 +1,6 @@ /* gzlog.h - Copyright (C) 2004, 2008 Mark Adler, all rights reserved - version 2.0, 25 Apr 2008 + Copyright (C) 2004, 2008, 2012 Mark Adler, all rights reserved + version 2.1, 8 Jul 2012 This software is provided 'as-is', without any express or implied warranty. In no event will the author be held liable for any damages @@ -27,6 +27,7 @@ Interface changed slightly in that now path is a prefix Compression now occurs as needed during gzlog_write() gzlog_write() now always leaves the log file as valid gzip + 2.1 8 Jul 2012 Fix argument checks in gzlog_compress() and gzlog_write() */ /* |