More complete fix for bug CORE-2368 : AV after isc_cancel_events if e…

…vent was not found
FirebirdSQL · Mar 23, 2009 · b85cdf0 · b85cdf0
1 parent 611498b
commit b85cdf0
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/remote/server.cpp b/src/remote/server.cpp
@@ -1061,7 +1061,8 @@ static ISC_STATUS cancel_events( rem_port* port, P_EVENT * stuff, PACKET* send)
  *
  **************************************/
     ISC_STATUS_ARRAY status_vector;
-
+	success(status_vector);
+
 /* Which database ? */
 
 	RDB rdb = port->port_context;
@@ -1080,10 +1081,7 @@ static ISC_STATUS cancel_events( rem_port* port, P_EVENT * stuff, PACKET* send)
 /* If no event found, pretend it was cancelled */
 
 	if (!event)
-	{
-		success(status_vector);
 		return port->send_response(send, 0, 0, status_vector);
-	}
 
 /* cancel the event */