Fossil SCM
Fix the blob_append_tcl_literal() routine to escape carriage-return characters (U+000d). Possible fix for the problem reported at [forum:/forumpost/390440e9793bfef7|forum post 390440e9793bfef7].
Commit
b4c961e8fb788d2b8dda2d6e2828d4e169f46fd04f314d8a2d8453a88915ebd3
Parent
8caab6155eb40cf…
1 file changed
+7
-4
+7
-4
| --- src/blob.c | ||
| +++ src/blob.c | ||
| @@ -367,33 +367,36 @@ | ||
| 367 | 367 | */ |
| 368 | 368 | void blob_append_tcl_literal(Blob *pOut, const char *z, int n){ |
| 369 | 369 | int i; |
| 370 | 370 | blob_append_char(pOut, '"'); |
| 371 | 371 | for(i=0; i<n; i++){ |
| 372 | - switch( z[i] ){ | |
| 372 | + char c = z[i]; | |
| 373 | + switch( c ){ | |
| 374 | + case '\r': c = 'r'; | |
| 373 | 375 | case '[': |
| 374 | 376 | case ']': |
| 375 | 377 | case '$': |
| 376 | 378 | case '"': |
| 377 | 379 | case '\\': |
| 378 | 380 | blob_append_char(pOut, '\\'); |
| 379 | 381 | default: |
| 380 | - blob_append_char(pOut, z[i]); | |
| 382 | + blob_append_char(pOut, c); | |
| 381 | 383 | } |
| 382 | 384 | } |
| 383 | 385 | blob_append_char(pOut, '"'); |
| 384 | 386 | } |
| 385 | 387 | void blob_append_json_literal(Blob *pOut, const char *z, int n){ |
| 386 | 388 | int i; |
| 387 | 389 | blob_append_char(pOut, '"'); |
| 388 | 390 | for(i=0; i<n; i++){ |
| 389 | - switch( z[i] ){ | |
| 391 | + char c = z[i]; | |
| 392 | + switch( c ){ | |
| 390 | 393 | case '"': |
| 391 | 394 | case '\\': |
| 392 | 395 | blob_append_char(pOut, '\\'); |
| 393 | 396 | default: |
| 394 | - blob_append_char(pOut, z[i]); | |
| 397 | + blob_append_char(pOut, c); | |
| 395 | 398 | } |
| 396 | 399 | } |
| 397 | 400 | blob_append_char(pOut, '"'); |
| 398 | 401 | } |
| 399 | 402 | |
| 400 | 403 |
| --- src/blob.c | |
| +++ src/blob.c | |
| @@ -367,33 +367,36 @@ | |
| 367 | */ |
| 368 | void blob_append_tcl_literal(Blob *pOut, const char *z, int n){ |
| 369 | int i; |
| 370 | blob_append_char(pOut, '"'); |
| 371 | for(i=0; i<n; i++){ |
| 372 | switch( z[i] ){ |
| 373 | case '[': |
| 374 | case ']': |
| 375 | case '$': |
| 376 | case '"': |
| 377 | case '\\': |
| 378 | blob_append_char(pOut, '\\'); |
| 379 | default: |
| 380 | blob_append_char(pOut, z[i]); |
| 381 | } |
| 382 | } |
| 383 | blob_append_char(pOut, '"'); |
| 384 | } |
| 385 | void blob_append_json_literal(Blob *pOut, const char *z, int n){ |
| 386 | int i; |
| 387 | blob_append_char(pOut, '"'); |
| 388 | for(i=0; i<n; i++){ |
| 389 | switch( z[i] ){ |
| 390 | case '"': |
| 391 | case '\\': |
| 392 | blob_append_char(pOut, '\\'); |
| 393 | default: |
| 394 | blob_append_char(pOut, z[i]); |
| 395 | } |
| 396 | } |
| 397 | blob_append_char(pOut, '"'); |
| 398 | } |
| 399 | |
| 400 |
| --- src/blob.c | |
| +++ src/blob.c | |
| @@ -367,33 +367,36 @@ | |
| 367 | */ |
| 368 | void blob_append_tcl_literal(Blob *pOut, const char *z, int n){ |
| 369 | int i; |
| 370 | blob_append_char(pOut, '"'); |
| 371 | for(i=0; i<n; i++){ |
| 372 | char c = z[i]; |
| 373 | switch( c ){ |
| 374 | case '\r': c = 'r'; |
| 375 | case '[': |
| 376 | case ']': |
| 377 | case '$': |
| 378 | case '"': |
| 379 | case '\\': |
| 380 | blob_append_char(pOut, '\\'); |
| 381 | default: |
| 382 | blob_append_char(pOut, c); |
| 383 | } |
| 384 | } |
| 385 | blob_append_char(pOut, '"'); |
| 386 | } |
| 387 | void blob_append_json_literal(Blob *pOut, const char *z, int n){ |
| 388 | int i; |
| 389 | blob_append_char(pOut, '"'); |
| 390 | for(i=0; i<n; i++){ |
| 391 | char c = z[i]; |
| 392 | switch( c ){ |
| 393 | case '"': |
| 394 | case '\\': |
| 395 | blob_append_char(pOut, '\\'); |
| 396 | default: |
| 397 | blob_append_char(pOut, c); |
| 398 | } |
| 399 | } |
| 400 | blob_append_char(pOut, '"'); |
| 401 | } |
| 402 | |
| 403 |