possible fix for wrong memchr / strchar socketReceive

toniebox-reverse-engineering · Nov 13, 2024 · 2d11e9e · 2d11e9e
1 parent e3266ca
commit 2d11e9e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/platform/platform_linux.c b/src/platform/platform_linux.c
@@ -281,17 +281,17 @@ error_t socketReceive(Socket *socket, void *data_in,
             const char *ptr = NULL;
 
             /* First, check for the null terminator (0x00) in the buffer */
-            const char *null_pos = memchr(buff->buffer, 0x00, buff->buffer_used);
+            const char *null_pos = memchr(buff->buffer, 0x00, max_size);
             if (null_pos)
             {
                 /* If null terminator is found, use strchr up to the null */
                 ptr = strchr(buff->buffer, flags & 0xFF);
             }
             else
             {
-                TRACE_DEBUG("buffer does not contain null terminator\r\n");
+                TRACE_WARNING("buffer does not contain null terminator\r\n");
                 /* If no null terminator, safely use memchr over the whole buffer */
-                ptr = memchr(buff->buffer, flags & 0xFF, buff->buffer_used);
+                ptr = memchr(buff->buffer, flags & 0xFF, max_size);
             }
 
             if (ptr)

diff --git a/src/platform/platform_windows.c b/src/platform/platform_windows.c
@@ -330,17 +330,17 @@ error_t socketReceive(Socket *socket, void *data_in,
             const char *ptr = NULL;
 
             /* First, check for the null terminator (0x00) in the buffer */
-            const char *null_pos = memchr(buff->buffer, 0x00, buff->buffer_used);
+            const char *null_pos = memchr(buff->buffer, 0x00, max_size);
             if (null_pos)
             {
                 /* If null terminator is found, use strchr up to the null */
                 ptr = strchr(buff->buffer, flags & 0xFF);
             }
             else
             {
-                TRACE_DEBUG("buffer does not contain null terminator\r\n");
+                TRACE_WARNING("buffer does not contain null terminator\r\n");
                 /* If no null terminator, safely use memchr over the whole buffer */
-                ptr = memchr(buff->buffer, flags & 0xFF, buff->buffer_used);
+                ptr = memchr(buff->buffer, flags & 0xFF, max_size);
             }
 
             if (ptr)