Fossil SCM
Put back a couple of overzealously deleted lines.
Commit
7832da88f58cd72d024caeba7dfca2c56867dace9ffd4e41f8d41826a90217ac
Parent
6a617d004fb8c24…
2 files changed
+1
+1
+1
| --- src/descendants.c | ||
| +++ src/descendants.c | ||
| @@ -535,10 +535,11 @@ | ||
| 535 | 535 | zBranchPoint ? zBranchPoint : ""); |
| 536 | 536 | comment_print(z, zCom, 7, width, get_comment_format()); |
| 537 | 537 | fossil_free(z); |
| 538 | 538 | fossil_free(zBranchPoint); |
| 539 | 539 | } |
| 540 | + fossil_free(zMainBranch); | |
| 540 | 541 | fossil_free(zLastBr); |
| 541 | 542 | db_finalize(&q); |
| 542 | 543 | } |
| 543 | 544 | |
| 544 | 545 | /* |
| 545 | 546 |
| --- src/descendants.c | |
| +++ src/descendants.c | |
| @@ -535,10 +535,11 @@ | |
| 535 | zBranchPoint ? zBranchPoint : ""); |
| 536 | comment_print(z, zCom, 7, width, get_comment_format()); |
| 537 | fossil_free(z); |
| 538 | fossil_free(zBranchPoint); |
| 539 | } |
| 540 | fossil_free(zLastBr); |
| 541 | db_finalize(&q); |
| 542 | } |
| 543 | |
| 544 | /* |
| 545 |
| --- src/descendants.c | |
| +++ src/descendants.c | |
| @@ -535,10 +535,11 @@ | |
| 535 | zBranchPoint ? zBranchPoint : ""); |
| 536 | comment_print(z, zCom, 7, width, get_comment_format()); |
| 537 | fossil_free(z); |
| 538 | fossil_free(zBranchPoint); |
| 539 | } |
| 540 | fossil_free(zMainBranch); |
| 541 | fossil_free(zLastBr); |
| 542 | db_finalize(&q); |
| 543 | } |
| 544 | |
| 545 | /* |
| 546 |
+1
| --- src/json_branch.c | ||
| +++ src/json_branch.c | ||
| @@ -367,10 +367,11 @@ | ||
| 367 | 367 | cson_object_set(pay,"basis",json_new_string(opt.zBasis)); |
| 368 | 368 | cson_object_set(pay,"rid",json_new_int(rid)); |
| 369 | 369 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 370 | 370 | cson_object_set(pay,"uuid", json_new_string(zUuid)); |
| 371 | 371 | cson_object_set(pay, "isPrivate", cson_value_new_bool(opt.isPrivate)); |
| 372 | + free(zUuid); | |
| 372 | 373 | if(opt.zColor){ |
| 373 | 374 | cson_object_set(pay,"bgColor",json_new_string(opt.zColor)); |
| 374 | 375 | } |
| 375 | 376 | |
| 376 | 377 | goto ok; |
| 377 | 378 |
| --- src/json_branch.c | |
| +++ src/json_branch.c | |
| @@ -367,10 +367,11 @@ | |
| 367 | cson_object_set(pay,"basis",json_new_string(opt.zBasis)); |
| 368 | cson_object_set(pay,"rid",json_new_int(rid)); |
| 369 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 370 | cson_object_set(pay,"uuid", json_new_string(zUuid)); |
| 371 | cson_object_set(pay, "isPrivate", cson_value_new_bool(opt.isPrivate)); |
| 372 | if(opt.zColor){ |
| 373 | cson_object_set(pay,"bgColor",json_new_string(opt.zColor)); |
| 374 | } |
| 375 | |
| 376 | goto ok; |
| 377 |
| --- src/json_branch.c | |
| +++ src/json_branch.c | |
| @@ -367,10 +367,11 @@ | |
| 367 | cson_object_set(pay,"basis",json_new_string(opt.zBasis)); |
| 368 | cson_object_set(pay,"rid",json_new_int(rid)); |
| 369 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 370 | cson_object_set(pay,"uuid", json_new_string(zUuid)); |
| 371 | cson_object_set(pay, "isPrivate", cson_value_new_bool(opt.isPrivate)); |
| 372 | free(zUuid); |
| 373 | if(opt.zColor){ |
| 374 | cson_object_set(pay,"bgColor",json_new_string(opt.zColor)); |
| 375 | } |
| 376 | |
| 377 | goto ok; |
| 378 |