Fossil SCM
Address builtin_deliver_multiple_js_files() endless loop reported in [forum:a9a60fab07|forum post a9a60fab07].
Commit
76c9bbb3bd2d708f064c64d92bfe2a0fe52d5a3de0fa9825b29f46b508e7446d
Parent
db7084949583735…
1 file changed
+2
-2
+2
-2
| --- src/builtin.c | ||
| +++ src/builtin.c | ||
| @@ -148,12 +148,12 @@ | ||
| 148 | 148 | if( i>0 && i<=count(aBuiltinFiles) ){ |
| 149 | 149 | blob_appendf(pOut, "/* %s */\n", aBuiltinFiles[i-1].zName); |
| 150 | 150 | blob_append(pOut, (const char*)aBuiltinFiles[i-1].pData, |
| 151 | 151 | aBuiltinFiles[i-1].nByte); |
| 152 | 152 | } |
| 153 | - while( fossil_isdigit(zList[0]) ) zList++; | |
| 154 | - if( zList[0]==',' ) zList++; | |
| 153 | + while( zList[0] && fossil_isdigit(zList[0]) ) zList++; | |
| 154 | + while( zList[0] && !fossil_isdigit(zList[0]) ) zList++; | |
| 155 | 155 | } |
| 156 | 156 | return; |
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | /* |
| 160 | 160 |
| --- src/builtin.c | |
| +++ src/builtin.c | |
| @@ -148,12 +148,12 @@ | |
| 148 | if( i>0 && i<=count(aBuiltinFiles) ){ |
| 149 | blob_appendf(pOut, "/* %s */\n", aBuiltinFiles[i-1].zName); |
| 150 | blob_append(pOut, (const char*)aBuiltinFiles[i-1].pData, |
| 151 | aBuiltinFiles[i-1].nByte); |
| 152 | } |
| 153 | while( fossil_isdigit(zList[0]) ) zList++; |
| 154 | if( zList[0]==',' ) zList++; |
| 155 | } |
| 156 | return; |
| 157 | } |
| 158 | |
| 159 | /* |
| 160 |
| --- src/builtin.c | |
| +++ src/builtin.c | |
| @@ -148,12 +148,12 @@ | |
| 148 | if( i>0 && i<=count(aBuiltinFiles) ){ |
| 149 | blob_appendf(pOut, "/* %s */\n", aBuiltinFiles[i-1].zName); |
| 150 | blob_append(pOut, (const char*)aBuiltinFiles[i-1].pData, |
| 151 | aBuiltinFiles[i-1].nByte); |
| 152 | } |
| 153 | while( zList[0] && fossil_isdigit(zList[0]) ) zList++; |
| 154 | while( zList[0] && !fossil_isdigit(zList[0]) ) zList++; |
| 155 | } |
| 156 | return; |
| 157 | } |
| 158 | |
| 159 | /* |
| 160 |