From: Zdenek Dohnal Date: Thu, 8 Aug 2024 06:50:26 +0000 (+0200) Subject: Adjust #893 for stream 2.4.x X-Git-Tag: v2.4.11~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb93a6e20a8f996291b22bd3236e17f17798eeff;p=thirdparty%2Fcups.git Adjust #893 for stream 2.4.x --- diff --git a/cups/ipp.c b/cups/ipp.c index f44dd0553c..47ba9fa261 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -3208,7 +3208,7 @@ ippReadIO(void *src, /* I - Data source */ if ((attr = ipp->current = ipp_add_attr(ipp, (char *)buffer, ipp->curtag, tag, 1)) == NULL) { -+ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unable to allocate IPP attribute."), 1); + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unable to allocate IPP attribute."), 1); DEBUG_puts("1ippReadIO: unable to allocate attribute."); goto rollback; } diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c index b1fc298bf9..f3f71a0555 100644 --- a/cups/tls-gnutls.c +++ b/cups/tls-gnutls.c @@ -1310,7 +1310,7 @@ _httpTLSStart(http_t *http) /* I - Connection to server */ strerror(errno))); http->error = errno; http->status = HTTP_STATUS_ERROR; - _cupsSetHTTPError(HTTP_STATUS_ERROR); + _cupsSetHTTPError(http, HTTP_STATUS_ERROR); return (-1); }