summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/log.c17
2 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e13517..f482c5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2002-04-26 Robert James Kaes <rjkaes@flarenet.com>
+ * src/log.c (send_stored_logs): Check the return value of
+ hashmap_first() since it could be -1, indicating an empty hashmap.
+
* src/reqs.c (process_client_headers):
(process_server_headers): Test the return value of hashmap_first()
since the hashmap could be empty (returning a -1 via hashmap_first.)
diff --git a/src/log.c b/src/log.c
index 5ae6ded..9577e5f 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,4 +1,4 @@
-/* $Id: log.c,v 1.18 2002-04-25 18:56:43 rjkaes Exp $
+/* $Id: log.c,v 1.19 2002-04-26 16:50:55 rjkaes Exp $
*
* Logs the various messages which tinyproxy produces to either a log file or
* the syslog daemon. Not much to it...
@@ -159,13 +159,14 @@ send_stored_logs(void)
char *level;
char *string;
- for (iter = hashmap_first(log_message_storage);
- iter != hashmap_is_end(log_message_storage, iter);
- ++iter) {
- hashmap_return_entry(log_message_storage,
- iter,
- &string,
- (void **)&level);
+ iter = hashmap_first(log_message_storage);
+ if (iter >= 0) {
+ for ( ; iter != hashmap_is_end(log_message_storage, iter); ++iter) {
+ hashmap_return_entry(log_message_storage,
+ iter,
+ &string,
+ (void **)&level);
+ }
}
hashmap_delete(log_message_storage);