Array bound checking should be done _before_ checking for null termin…

…ators. Similar issue as in commit c03e650; in both cases, Valgrind will complain about the access of an element just past the end of the valid array.
Bill-Gray · Feb 12, 2025 · 5a61709 · 5a61709
1 parent 38c7571
commit 5a61709
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pdcurses/util.c b/pdcurses/util.c
@@ -482,9 +482,9 @@ size_t PDC_wcstombs(char *dest, const wchar_t *src, size_t n)
     if (!src || !dest)
         return 0;
 
-    while (*src && i + 4 < n)
+    while( i + 4 < n && *src)
        i += PDC_wc_to_utf8( dest + i, *src++);
-    while (*src && i < n)
+    while( i < n && *src)
     {
        char tbuff[4];
        size_t count = (size_t)PDC_wc_to_utf8( tbuff, *src++);