Fix wrong cb parameter in cupsConnectDest() and return NULL pointer…

… if connection cannnot be established
OpenPrinting · May 16, 2024 · f7015ff · f7015ff
1 parent 09ab94d
commit f7015ff
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/cups/dest.c b/cups/dest.c
@@ -647,12 +647,17 @@ cupsConnectDest(
  if (cb)
  (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_CONNECTING, dest);
 
- if (!httpReconnect2(http, msec, cancel) && cb)
+ if (httpReconnect2(http, msec, cancel))
  {
- if (cancel && *cancel)
- (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_CONNECTING, dest);
- else
- (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_ERROR, dest);
+ if (cb)
+ {
+ if (cancel && *cancel)
+ (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_CONNECTING, dest);
+ else
+ (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_ERROR, dest);
+ }
+ httpClose(http);
+ return (NULL);
  }
  else if (cb)
  (*cb)(user_data, CUPS_DEST_FLAGS_NONE, dest);