From 9d12fe39c5b526b4b84d0df4f71fd3cf6bdbcc8f Mon Sep 17 00:00:00 2001
From: s-hadinger <49731213+s-hadinger@users.noreply.github.com>
Date: Sun, 16 Nov 2025 12:52:18 +0100
Subject: [PATCH] Berry alternative to strnlen 2 (#24124)

---
 lib/libesp32/berry/src/be_lexer.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/libesp32/berry/src/be_lexer.c b/lib/libesp32/berry/src/be_lexer.c
index e93353c28..36afaa6c1 100644
--- a/lib/libesp32/berry/src/be_lexer.c
+++ b/lib/libesp32/berry/src/be_lexer.c
@@ -285,7 +285,11 @@ static void tr_string(blexer *lexer)
         }
     }
     size_t len = dst - lexbuf(lexer);
-    lexer->buf.len = strnlen(lexbuf(lexer), len);
+    /* equivalent to strnlen() */
+    /* lexer->buf.len = strnlen(lexbuf(lexer), len); */
+    const char* str = (const char*) lexbuf(lexer);
+    const char* found = memchr(str, '\0', len);
+    lexer->buf.len = found ? (size_t)(found - str) : len;
 }
 
 static int skip_newline(blexer *lexer)