---------------------
PatchSet 5557 
Date: 2002/12/15 10:29:40
Author: ymc
Branch: dsa
Tag: (none) 
Log:
assignments that dereferences http->entry->p will check http->entry
and return NULL when http->entry is NULL

Members: 
	src/client_side.c:1.5.2.9.2.7->1.5.2.9.2.8 
	src/ftp.c:1.4.2.7.2.3->1.4.2.7.2.4 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v
retrieving revision 1.5.2.9.2.7
retrieving revision 1.5.2.9.2.8
diff -u -r1.5.2.9.2.7 -r1.5.2.9.2.8
--- squid/src/client_side.c	9 Dec 2002 06:35:00 -0000	1.5.2.9.2.7
+++ squid/src/client_side.c	15 Dec 2002 10:29:40 -0000	1.5.2.9.2.8
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.5.2.9.2.7 2002/12/09 06:35:00 ymc Exp $
+ * $Id: client_side.c,v 1.5.2.9.2.8 2002/12/15 10:29:40 ymc Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -1976,7 +1976,7 @@
 {
     clientHttpRequest *http = data;
 #ifdef DSA
-    StoreEntry *entry = http->entry->p;
+    StoreEntry *entry = http->entry ? http->entry->p : NULL;
 #else
     StoreEntry *entry = http->entry;
 #endif
@@ -2202,7 +2202,7 @@
 {
     clientHttpRequest *http = data;
 #ifdef DSA
-    StoreEntry *entry = http->entry->p;
+    StoreEntry *entry = http->entry ? http->entry->p : NULL;
 #else
     StoreEntry *entry = http->entry;
 #endif
@@ -2584,7 +2584,7 @@
 	http->log_type = LOG_TCP_REDIRECT;
 #endif
 #ifdef DSA
-	instanceReleaseRequest(http->entry);
+	storeReleaseRequest(http->entry->p);
 	httpRedirectReply(rep, http->redirect.status, http->redirect.location);
 	httpReplySwapOut(rep, http->entry->p);
 	httpReplyDestroy(rep);
Index: squid/src/ftp.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/ftp.c,v
retrieving revision 1.4.2.7.2.3
retrieving revision 1.4.2.7.2.4
diff -u -r1.4.2.7.2.3 -r1.4.2.7.2.4
--- squid/src/ftp.c	9 Dec 2002 03:53:28 -0000	1.4.2.7.2.3
+++ squid/src/ftp.c	15 Dec 2002 10:29:41 -0000	1.4.2.7.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.c,v 1.4.2.7.2.3 2002/12/09 03:53:28 ymc Exp $
+ * $Id: ftp.c,v 1.4.2.7.2.4 2002/12/15 10:29:41 ymc Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -1135,7 +1135,7 @@
 	key = storeKeyPublic(entry->mem_obj->url, entry->mem_obj->method);
 #ifdef DSA	
 	if ((pe = instanceGet(key)) != NULL)
-	    instanceRelease(pe);
+	    storeRelease(pe->p);
 #else		
 	if ((pe = storeGet(key)) != NULL)
 	    storeRelease(pe);