Fixed a bug that caused a dereferencing of a null pointer when cleani…

…ng up.
flightaware · Nov 27, 2005 · c50b8d1 · c50b8d1
1 parent db46f51
commit c50b8d1
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/generic/pgtclId.c b/generic/pgtclId.c
@@ -546,18 +546,22 @@ PgDelConnectionId(DRIVER_DEL_PROTO)
 
 	for (i = 0; i < connid->res_max; i++)
 	{
-            resultid = connid->resultids[i];
 	    if (connid->results[i])
-            {
-		PQclear(connid->results[i]);
+		{
+			PQclear(connid->results[i]);
 
-            Tcl_DecrRefCount(resultid->str);
-            }
 
-			if ((resultid->nullValueString != NULL) && (resultid->nullValueString != connid->nullValueString))
-				ckfree (resultid->nullValueString);
+            resultid = connid->resultids[i];
+
+			if (resultid != NULL) {
+				Tcl_DecrRefCount(resultid->str);
 
-            ckfree((void *)resultid);
+				if ((resultid->nullValueString != NULL) && (resultid->nullValueString != connid->nullValueString))
+					ckfree (resultid->nullValueString);
+
+				ckfree((void *)resultid);
+			}
+		}
 	}
 
 	ckfree((void *)connid->results);