Changeset 6d0e133 in mainline

Timestamp:

2025-04-14T08:30:07Z (4 days ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Children:

6120b7b

Parents:

f5e1692

Message:

Improve handling of invalid data in str_decode()

File:

• common/str.c (modified) (2 diffs)

common/str.c

@@ -226 +226 @@
         unsigned int b0_bits = 6 - cbytes;  /* Data bits in first byte */
 
-        if (*offset + cbytes > size)
+        if (cbytes < 0 || *offset + cbytes > size)
                 return U_SPECIAL;
 
@@ -233 +233 @@
         /* Decode continuation bytes */
         while (cbytes > 0) {
-                uint8_t b = (uint8_t) str[(*offset)++];
+                uint8_t b = (uint8_t) str[*offset];
 
                 if (!_is_continuation_byte(b))
                         return U_SPECIAL;
+
+                (*offset)++;
 
                 /* Shift data bits to ch */