mirror of
https://gitee.com/openharmony/third_party_cups
synced 2024-11-27 03:50:24 +00:00
38 lines
944 B
Diff
38 lines
944 B
Diff
|
From fd8bc2d32589d1fd91fe1c0521be2a7c0462109e Mon Sep 17 00:00:00 2001
|
|||
|
|
From: Zdenek Dohnal <zdohnal@redhat.com>
|
|||
|
|
Date: Thu, 1 Jun 2023 12:04:00 +0200
|
|||
|
|
Subject: [PATCH] cups/string.c: Return if `size` is 0 (fixes CVE-2023-32324)
|
|||
|
|
|
|||
|
|
Reference:https://github.com/OpenPrinting/cups/commit/fd8bc2d32589d1fd91fe1c0521be2a7c0462109e
|
|||
|
|
Conflict:NA
|
|||
|
|
|
|||
|
|
---
|
|||
|
|
cups/string.c | 4 ++++
|
|||
|
|
1 file changed, 4 insertions(+)
|
|||
|
|
|
|||
|
|
diff --git a/cups/string.c b/cups/string.c
|
|||
|
|
index 93cdad1..5def888 100644
|
|||
|
|
--- a/cups/string.c
|
|||
|
|
+++ b/cups/string.c
|
|||
|
|
@@ -1,6 +1,7 @@
|
|||
|
|
/*
|
|||
|
|
* String functions for CUPS.
|
|||
|
|
*
|
|||
|
|
+ * Copyright © 2023 by OpenPrinting.
|
|||
|
|
* Copyright © 2007-2019 by Apple Inc.
|
|||
|
|
* Copyright © 1997-2007 by Easy Software Products.
|
|||
|
|
*
|
|||
|
|
@@ -730,6 +731,9 @@ _cups_strlcpy(char *dst, /* O - Destination string */
|
|||
|
|
size_t srclen; /* Length of source string */
|
|||
|
|
|
|||
|
|
|
|||
|
|
+ if (size == 0)
|
|||
|
|
+ return (0);
|
|||
|
|
+
|
|||
|
|
/*
|
|||
|
|
* Figure out how much room is needed...
|
|||
|
|
*/
|
|||
|
|
--
|
|||
|
|
2.27.0
|
|||
|
|
|