Fossil SCM
Fix a bad call to rollback when attachment saving fails due to a bad captcha.
Commit
3e32def5b20aba99e89a28fdb26fa55a2da1bbd5a305ac9e53fee11bb96c9d73
Parent
96cdaf93f70b618…
1 file changed
+6
-2
+6
-2
| --- src/attach.c | ||
| +++ src/attach.c | ||
| @@ -910,15 +910,19 @@ | ||
| 910 | 910 | } |
| 911 | 911 | } |
| 912 | 912 | db_end_transaction(bRollback); |
| 913 | 913 | return; |
| 914 | 914 | ajax_post_403: |
| 915 | - db_rollback_transaction(); | |
| 915 | + if( db_transaction_nesting_depth()>0 ){ | |
| 916 | + db_rollback_transaction(); | |
| 917 | + } | |
| 916 | 918 | ajax_route_error(403, "Permission denied."); |
| 917 | 919 | return; |
| 918 | 920 | ajax_post_404: |
| 919 | - db_rollback_transaction(); | |
| 921 | + if( db_transaction_nesting_depth()>0 ){ | |
| 922 | + db_rollback_transaction(); | |
| 923 | + } | |
| 920 | 924 | ajax_route_error(404, "Target not found."); |
| 921 | 925 | return; |
| 922 | 926 | } |
| 923 | 927 | |
| 924 | 928 | /* |
| 925 | 929 |
| --- src/attach.c | |
| +++ src/attach.c | |
| @@ -910,15 +910,19 @@ | |
| 910 | } |
| 911 | } |
| 912 | db_end_transaction(bRollback); |
| 913 | return; |
| 914 | ajax_post_403: |
| 915 | db_rollback_transaction(); |
| 916 | ajax_route_error(403, "Permission denied."); |
| 917 | return; |
| 918 | ajax_post_404: |
| 919 | db_rollback_transaction(); |
| 920 | ajax_route_error(404, "Target not found."); |
| 921 | return; |
| 922 | } |
| 923 | |
| 924 | /* |
| 925 |
| --- src/attach.c | |
| +++ src/attach.c | |
| @@ -910,15 +910,19 @@ | |
| 910 | } |
| 911 | } |
| 912 | db_end_transaction(bRollback); |
| 913 | return; |
| 914 | ajax_post_403: |
| 915 | if( db_transaction_nesting_depth()>0 ){ |
| 916 | db_rollback_transaction(); |
| 917 | } |
| 918 | ajax_route_error(403, "Permission denied."); |
| 919 | return; |
| 920 | ajax_post_404: |
| 921 | if( db_transaction_nesting_depth()>0 ){ |
| 922 | db_rollback_transaction(); |
| 923 | } |
| 924 | ajax_route_error(404, "Target not found."); |
| 925 | return; |
| 926 | } |
| 927 | |
| 928 | /* |
| 929 |