[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] 02/03: MHD_str_remove_token_caseless_(): added check, m
From: |
gnunet |
Subject: |
[libmicrohttpd] 02/03: MHD_str_remove_token_caseless_(): added check, muted compiler warnings |
Date: |
Sun, 29 May 2022 20:36:09 +0200 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 018e77a4f0a4f4c1fe16fa2a8311158d99692f2c
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Sun May 29 16:05:54 2022 +0300
MHD_str_remove_token_caseless_(): added check, muted compiler warnings
---
src/microhttpd/mhd_str.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/microhttpd/mhd_str.c b/src/microhttpd/mhd_str.c
index ece6ef44..ff8b4e3e 100644
--- a/src/microhttpd/mhd_str.c
+++ b/src/microhttpd/mhd_str.c
@@ -568,6 +568,12 @@ MHD_str_remove_token_caseless_ (const char *str,
mhd_assert (NULL == memchr (token, ',', token_len));
mhd_assert (0 <= *buf_size);
+ if (SSIZE_MAX <= ((str_len / 2) * 3 + 3))
+ {
+ /* The return value may overflow, refuse */
+ *buf_size = (ssize_t) -1;
+ return false;
+ }
s1 = str;
s2 = buf;
token_removed = false;
@@ -627,7 +633,7 @@ MHD_str_remove_token_caseless_ (const char *str,
copy_size = (size_t) (s1 - cur_token);
if (buf == s2)
{ /* The first token to copy to the output */
- if (*buf_size < copy_size)
+ if ((size_t) *buf_size < copy_size)
{ /* Not enough space in the output buffer */
*buf_size = (ssize_t) -1;
return false;
@@ -636,7 +642,7 @@ MHD_str_remove_token_caseless_ (const char *str,
else
{ /* Some token was already copied to the output buffer */
mhd_assert (s2 > buf);
- if (*buf_size < ((size_t) (s2 - buf)) + copy_size + 2)
+ if ((size_t) *buf_size < ((size_t) (s2 - buf)) + copy_size + 2)
{ /* Not enough space in the output buffer */
*buf_size = (ssize_t) -1;
return false;
@@ -661,7 +667,7 @@ MHD_str_remove_token_caseless_ (const char *str,
(',' != *s1) && (' ' != *s1) && ('\t' != *s1) )
{
mhd_assert (s2 >= buf);
- if (*buf_size <= (size_t) (s2 - buf)) /* '<= s2' equals '< s2 + 1' */
+ if ((size_t) *buf_size <= (size_t) (s2 - buf)) /* '<= s2' equals '< s2
+ 1' */
{ /* Not enough space in the output buffer */
*buf_size = (ssize_t) -1;
return false;
@@ -681,7 +687,7 @@ MHD_str_remove_token_caseless_ (const char *str,
if (((size_t) (s1 - str) < str_len) && (',' != *s1))
{ /* Not the end of the current token */
mhd_assert (s2 >= buf);
- if (*buf_size <= (size_t) (s2 - buf)) /* '<= s2' equals '< s2 + 1' */
+ if ((size_t) *buf_size <= (size_t) (s2 - buf)) /* '<= s2' equals '< s2
+ 1' */
{ /* Not enough space in the output buffer */
*buf_size = (ssize_t) -1;
return false;
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.