Fossil SCM
Fix a bug triggering a failed assertion in blob_str() and dumping core when doing a 'fossil commit --no-prompt'.
Commit
d1f74a367c73d92bb5dc9e25a07b2d5a16bd066f82bf7474f2b33629d6cdaf6e
Parent
30ac5c00dd6a4d6…
1 file changed
+2
+2
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -2515,10 +2515,12 @@ | ||
| 2515 | 2515 | if( autosync_loop(syncFlags, db_get_int("autosync-tries", 1), 1) ){ |
| 2516 | 2516 | fossil_fatal("Auto-pull failed. Commit aborted."); |
| 2517 | 2517 | } |
| 2518 | 2518 | bRecheck = 1; |
| 2519 | 2519 | } |
| 2520 | + }else{ | |
| 2521 | + blob_zero(&comment); | |
| 2520 | 2522 | } |
| 2521 | 2523 | }while( bRecheck ); |
| 2522 | 2524 | |
| 2523 | 2525 | if( blob_size(&comment)==0 ){ |
| 2524 | 2526 | if( !dryRunFlag ){ |
| 2525 | 2527 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2515,10 +2515,12 @@ | |
| 2515 | if( autosync_loop(syncFlags, db_get_int("autosync-tries", 1), 1) ){ |
| 2516 | fossil_fatal("Auto-pull failed. Commit aborted."); |
| 2517 | } |
| 2518 | bRecheck = 1; |
| 2519 | } |
| 2520 | } |
| 2521 | }while( bRecheck ); |
| 2522 | |
| 2523 | if( blob_size(&comment)==0 ){ |
| 2524 | if( !dryRunFlag ){ |
| 2525 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2515,10 +2515,12 @@ | |
| 2515 | if( autosync_loop(syncFlags, db_get_int("autosync-tries", 1), 1) ){ |
| 2516 | fossil_fatal("Auto-pull failed. Commit aborted."); |
| 2517 | } |
| 2518 | bRecheck = 1; |
| 2519 | } |
| 2520 | }else{ |
| 2521 | blob_zero(&comment); |
| 2522 | } |
| 2523 | }while( bRecheck ); |
| 2524 | |
| 2525 | if( blob_size(&comment)==0 ){ |
| 2526 | if( !dryRunFlag ){ |
| 2527 |