aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Ferris <bferris@google.com>2020-04-30 19:52:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-30 19:52:54 +0000
commitec1d84749a5fd324539e0ddc991359d348800aae (patch)
tree1538cef08e973378a87667f7833291c42e2d0d68
parent4db92ec1c7b90711709552e62011fb3316a6db0e (diff)
parentdb773ddf766d53b12e77f29d92eaa37c0dcf9fa8 (diff)
downloadlibcups-android-11.0.0_r41.tar.gz
Change-Id: I9d433855d60eee335b02f5631789416ce8ae480f
-rw-r--r--README.version1
-rw-r--r--cups/ipp.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/README.version b/README.version
index c2baa557..5a727df8 100644
--- a/README.version
+++ b/README.version
@@ -6,4 +6,5 @@ CUPS is the standards-based, open source printing system developed by Apple Inc.
Local Modifications:
Fix for CVE-2020-3898 (I1e4988e753c0ed1df43937b3009fd62ecd81ccc0)
+ Fix for CVE-2019-8842 (Ib3d4260899941f0c8050cf6d77a9022db63bdc66)
Use boringSSL
diff --git a/cups/ipp.c b/cups/ipp.c
index cc9c6af5..d46cc377 100644
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -2960,7 +2960,7 @@ ippReadIO(void *src, /* I - Data source */
* Read 32-bit "extension" tag...
*/
- if ((*cb)(src, buffer, 4) < 1)
+ if ((*cb)(src, buffer, 4) < 4)
{
DEBUG_puts("1ippReadIO: Callback returned EOF/error");
_cupsBufferRelease((char *)buffer);