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

…ators, as per @Hamayama's PDCurses-win10-jp fork.
Bill-Gray · Mar 14, 2021 · c03e650 · c03e650
1 parent 057fbc6
commit c03e650
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pdcurses/addstr.c b/pdcurses/addstr.c
@@ -75,7 +75,7 @@ int waddnstr(WINDOW *win, const char *str, int n)
     if (!win || !str)
         return ERR;
 
-    while (str[i] && (i < n || n < 0))
+    while( (i < n || n < 0) && str[i])
     {
 #ifdef PDC_WIDE
         wchar_t wch;
@@ -171,6 +171,7 @@ int waddnwstr(WINDOW *win, const wchar_t *wstr, int n)
         return ERR;
 
     while (wstr[i] && (i < n || n < 0))
+    while( (i < n || n < 0) && wstr[i])
     {
         chtype wch = wstr[i++];
 

diff --git a/pdcurses/insstr.c b/pdcurses/insstr.c
@@ -95,7 +95,7 @@ int winsnstr(WINDOW *win, const char *str, int n)
     p = wstr;
     i = 0;
 
-    while (str[i] && i < n)
+    while( i < n && str[i])
     {
         int retval = PDC_mbtowc(p, str + i, n - i);