aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-05-01 01:10:35 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-05-01 01:10:35 +0000
commit58d36d3200f2bd2328562d3e4f0aec6b020165a4 (patch)
tree1538cef08e973378a87667f7833291c42e2d0d68
parentcaa55c8d3441ba80268af3494b3d772185ae598b (diff)
parent239ddbfc0ceed8ee3b2920a7b32218a84e160f61 (diff)
downloadlibcups-android-vts-11.0_r16.tar.gz
Snap for 6449986 from 239ddbfc0ceed8ee3b2920a7b32218a84e160f61 to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1r-beta-2android11-tests-releaseandroid11-s1-releaseandroid11-release
Change-Id: Ie8df5bc2e872091870e9648bcc7f7571be396901
-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);