Fix for 1.1.4 ipcache_dnsHandleRead() coredump

From: Duane Wessels <wessels@dont-contact.us>
Date: Thu, 16 Jan 97 22:32:06 -0800

Index: src/ipcache.c
===================================================================
RCS file: /surf1/CVS/squid/src/ipcache.c,v
retrieving revision 1.95
diff -w -u -r1.95 ipcache.c
--- ipcache.c 1997/01/13 20:44:45 1.95
+++ ipcache.c 1997/01/17 00:06:14
@@ -687,9 +687,9 @@
         IpcacheStats.pending_hits++;
         ipcacheAddPending(i, fd, handler, handlerData);
         if (squid_curtime - i->expires > 60) {
- ipcacheChangeKey(i);
- i->status = IP_NEGATIVE_CACHED;
+ debug(14,0,"ipcache_nbgethostbyname: '%s' PENDING for %d seconds, aborting\n", name, squid_curtime + Config.negativeDnsTtl - i->expires);
             ipcache_call_pending(i);
+ ipcacheChangeKey(i);
         }
         return;
     } else {
@@ -1086,7 +1086,7 @@
         debug_trap("ipcacheChangeKey: hash_remove_link() failed\n");
         return;
     }
- sprintf(new_key, "%d/%128.128s", ++index, i->name);
+ sprintf(new_key, "%d/%-128.128s", ++index, i->name);
     safe_free(i->name);
     i->name = xstrdup(new_key);
     ipcache_add_to_hash(i);

Duane W.
Received on Thu Jan 16 1997 - 22:37:55 MST

This archive was generated by hypermail pre-2.1.9 : Tue Dec 09 2003 - 16:34:06 MST