Merge pull request #5011 from Pamplemousse/fix_adjustLoc

libexpr: Fix read out-of-bound on the heap
2021-07-15 09:23:59 +02:00 · 2021-07-15 09:23:59 +02:00 · 77d5b37da3
commit 77d5b37da3
parent bee71d692a 99f8fc995b
1 changed files with 4 additions and 2 deletions
--- a/src/libexpr/lexer.l
+++ b/src/libexpr/lexer.l
@ -38,11 +38,13 @@ static void adjustLoc(YYLTYPE * loc, const char * s, size_t len)
    loc->first_line = loc->last_line;
    loc->first_column = loc->last_column;

-    while (len--) {
+    for (size_t i = 0; i < len; i++) {
       switch (*s++) {
       case '\r':
-           if (*s == '\n') /* cr/lf */
+           if (*s == '\n') { /* cr/lf */
+               i++;
               s++;
+           }
           /* fall through */
       case '\n':
           ++loc->last_line;