Fossil SCM
Possibly fix the assertion fault reported by [forum:/forumpost/4baa888c5743e3e1|forum post 4baa888c5743e3e1]
Commit
3f8ee9e1f3b5bafa23c4b513a70da4cba9a10045fc784bb2ce0350ab67fcdf3e
Parent
cae03867de3c44e…
1 file changed
+1
-1
+1
-1
| --- src/http_ssl.c | ||
| +++ src/http_ssl.c | ||
| @@ -964,11 +964,10 @@ | ||
| 964 | 964 | }else{ |
| 965 | 965 | blob_append(&allText, blob_buffer(&x), blob_size(&x)); |
| 966 | 966 | } |
| 967 | 967 | } |
| 968 | 968 | } |
| 969 | - db_protect_pop(); | |
| 970 | 969 | if( !haveCert ){ |
| 971 | 970 | if( !haveKey ){ |
| 972 | 971 | fossil_fatal("missing certificate and private-key"); |
| 973 | 972 | }else{ |
| 974 | 973 | fossil_fatal("missing certificate"); |
| @@ -977,10 +976,11 @@ | ||
| 977 | 976 | fossil_fatal("missing private-key"); |
| 978 | 977 | } |
| 979 | 978 | if( !bFN ){ |
| 980 | 979 | db_set("ssl-cert", blob_str(&allText), 0); |
| 981 | 980 | } |
| 981 | + db_protect_pop(); | |
| 982 | 982 | db_commit_transaction(); |
| 983 | 983 | }else |
| 984 | 984 | if( strncmp("scrub",zCmd,nCmd)==0 && nCmd>4 ){ |
| 985 | 985 | int bForce = find_option("force","f",0)!=0; |
| 986 | 986 | verify_all_options(); |
| 987 | 987 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -964,11 +964,10 @@ | |
| 964 | }else{ |
| 965 | blob_append(&allText, blob_buffer(&x), blob_size(&x)); |
| 966 | } |
| 967 | } |
| 968 | } |
| 969 | db_protect_pop(); |
| 970 | if( !haveCert ){ |
| 971 | if( !haveKey ){ |
| 972 | fossil_fatal("missing certificate and private-key"); |
| 973 | }else{ |
| 974 | fossil_fatal("missing certificate"); |
| @@ -977,10 +976,11 @@ | |
| 977 | fossil_fatal("missing private-key"); |
| 978 | } |
| 979 | if( !bFN ){ |
| 980 | db_set("ssl-cert", blob_str(&allText), 0); |
| 981 | } |
| 982 | db_commit_transaction(); |
| 983 | }else |
| 984 | if( strncmp("scrub",zCmd,nCmd)==0 && nCmd>4 ){ |
| 985 | int bForce = find_option("force","f",0)!=0; |
| 986 | verify_all_options(); |
| 987 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -964,11 +964,10 @@ | |
| 964 | }else{ |
| 965 | blob_append(&allText, blob_buffer(&x), blob_size(&x)); |
| 966 | } |
| 967 | } |
| 968 | } |
| 969 | if( !haveCert ){ |
| 970 | if( !haveKey ){ |
| 971 | fossil_fatal("missing certificate and private-key"); |
| 972 | }else{ |
| 973 | fossil_fatal("missing certificate"); |
| @@ -977,10 +976,11 @@ | |
| 976 | fossil_fatal("missing private-key"); |
| 977 | } |
| 978 | if( !bFN ){ |
| 979 | db_set("ssl-cert", blob_str(&allText), 0); |
| 980 | } |
| 981 | db_protect_pop(); |
| 982 | db_commit_transaction(); |
| 983 | }else |
| 984 | if( strncmp("scrub",zCmd,nCmd)==0 && nCmd>4 ){ |
| 985 | int bForce = find_option("force","f",0)!=0; |
| 986 | verify_all_options(); |
| 987 |