Fossil SCM
moved some db_finalize() calls so that they would also be called in error cases.
Commit
997274e9be9203c9a4cda6a119d9c30ef25253ed
Parent
73e28dd71873b3e…
1 file changed
+3
-3
+3
-3
| --- src/json_timeline.c | ||
| +++ src/json_timeline.c | ||
| @@ -354,18 +354,18 @@ | ||
| 354 | 354 | if(flist){ |
| 355 | 355 | cson_object_set(row,"files",flist); |
| 356 | 356 | } |
| 357 | 357 | } |
| 358 | 358 | } |
| 359 | - db_finalize(&q); | |
| 360 | 359 | #undef SET |
| 361 | 360 | goto ok; |
| 362 | 361 | error: |
| 363 | 362 | assert( 0 != g.json.resultCode ); |
| 364 | 363 | cson_value_free(payV); |
| 365 | 364 | payV = NULL; |
| 366 | 365 | ok: |
| 366 | + db_finalize(&q); | |
| 367 | 367 | return payV; |
| 368 | 368 | } |
| 369 | 369 | |
| 370 | 370 | /* |
| 371 | 371 | ** Implementation of /json/timeline/wiki. |
| @@ -439,18 +439,18 @@ | ||
| 439 | 439 | ? FSL_JSON_E_ALLOC |
| 440 | 440 | : FSL_JSON_E_UNKNOWN; |
| 441 | 441 | goto error; |
| 442 | 442 | } |
| 443 | 443 | } |
| 444 | - db_finalize(&q); | |
| 445 | 444 | #undef SET |
| 446 | 445 | goto ok; |
| 447 | 446 | error: |
| 448 | 447 | assert( 0 != g.json.resultCode ); |
| 449 | 448 | cson_value_free(payV); |
| 450 | 449 | payV = NULL; |
| 451 | 450 | ok: |
| 451 | + db_finalize(&q); | |
| 452 | 452 | return payV; |
| 453 | 453 | } |
| 454 | 454 | |
| 455 | 455 | /* |
| 456 | 456 | ** Implementation of /json/timeline/ticket. |
| @@ -532,16 +532,16 @@ | ||
| 532 | 532 | ? FSL_JSON_E_ALLOC |
| 533 | 533 | : FSL_JSON_E_UNKNOWN; |
| 534 | 534 | goto error; |
| 535 | 535 | } |
| 536 | 536 | } |
| 537 | - db_finalize(&q); | |
| 538 | 537 | #undef SET |
| 539 | 538 | goto ok; |
| 540 | 539 | error: |
| 541 | 540 | assert( 0 != g.json.resultCode ); |
| 542 | 541 | cson_value_free(payV); |
| 543 | 542 | payV = NULL; |
| 544 | 543 | ok: |
| 544 | + db_finalize(&q); | |
| 545 | 545 | return payV; |
| 546 | 546 | } |
| 547 | 547 | |
| 548 | 548 |
| --- src/json_timeline.c | |
| +++ src/json_timeline.c | |
| @@ -354,18 +354,18 @@ | |
| 354 | if(flist){ |
| 355 | cson_object_set(row,"files",flist); |
| 356 | } |
| 357 | } |
| 358 | } |
| 359 | db_finalize(&q); |
| 360 | #undef SET |
| 361 | goto ok; |
| 362 | error: |
| 363 | assert( 0 != g.json.resultCode ); |
| 364 | cson_value_free(payV); |
| 365 | payV = NULL; |
| 366 | ok: |
| 367 | return payV; |
| 368 | } |
| 369 | |
| 370 | /* |
| 371 | ** Implementation of /json/timeline/wiki. |
| @@ -439,18 +439,18 @@ | |
| 439 | ? FSL_JSON_E_ALLOC |
| 440 | : FSL_JSON_E_UNKNOWN; |
| 441 | goto error; |
| 442 | } |
| 443 | } |
| 444 | db_finalize(&q); |
| 445 | #undef SET |
| 446 | goto ok; |
| 447 | error: |
| 448 | assert( 0 != g.json.resultCode ); |
| 449 | cson_value_free(payV); |
| 450 | payV = NULL; |
| 451 | ok: |
| 452 | return payV; |
| 453 | } |
| 454 | |
| 455 | /* |
| 456 | ** Implementation of /json/timeline/ticket. |
| @@ -532,16 +532,16 @@ | |
| 532 | ? FSL_JSON_E_ALLOC |
| 533 | : FSL_JSON_E_UNKNOWN; |
| 534 | goto error; |
| 535 | } |
| 536 | } |
| 537 | db_finalize(&q); |
| 538 | #undef SET |
| 539 | goto ok; |
| 540 | error: |
| 541 | assert( 0 != g.json.resultCode ); |
| 542 | cson_value_free(payV); |
| 543 | payV = NULL; |
| 544 | ok: |
| 545 | return payV; |
| 546 | } |
| 547 | |
| 548 |
| --- src/json_timeline.c | |
| +++ src/json_timeline.c | |
| @@ -354,18 +354,18 @@ | |
| 354 | if(flist){ |
| 355 | cson_object_set(row,"files",flist); |
| 356 | } |
| 357 | } |
| 358 | } |
| 359 | #undef SET |
| 360 | goto ok; |
| 361 | error: |
| 362 | assert( 0 != g.json.resultCode ); |
| 363 | cson_value_free(payV); |
| 364 | payV = NULL; |
| 365 | ok: |
| 366 | db_finalize(&q); |
| 367 | return payV; |
| 368 | } |
| 369 | |
| 370 | /* |
| 371 | ** Implementation of /json/timeline/wiki. |
| @@ -439,18 +439,18 @@ | |
| 439 | ? FSL_JSON_E_ALLOC |
| 440 | : FSL_JSON_E_UNKNOWN; |
| 441 | goto error; |
| 442 | } |
| 443 | } |
| 444 | #undef SET |
| 445 | goto ok; |
| 446 | error: |
| 447 | assert( 0 != g.json.resultCode ); |
| 448 | cson_value_free(payV); |
| 449 | payV = NULL; |
| 450 | ok: |
| 451 | db_finalize(&q); |
| 452 | return payV; |
| 453 | } |
| 454 | |
| 455 | /* |
| 456 | ** Implementation of /json/timeline/ticket. |
| @@ -532,16 +532,16 @@ | |
| 532 | ? FSL_JSON_E_ALLOC |
| 533 | : FSL_JSON_E_UNKNOWN; |
| 534 | goto error; |
| 535 | } |
| 536 | } |
| 537 | #undef SET |
| 538 | goto ok; |
| 539 | error: |
| 540 | assert( 0 != g.json.resultCode ); |
| 541 | cson_value_free(payV); |
| 542 | payV = NULL; |
| 543 | ok: |
| 544 | db_finalize(&q); |
| 545 | return payV; |
| 546 | } |
| 547 | |
| 548 |