Fossil SCM
fixed a missing db_finalize() in an error-handling case.
Commit
7906bab836801ed1f55f98769ed03e292346c254
Parent
54e1f1a53d22519…
1 file changed
+3
-3
+3
-3
| --- src/json_wiki.c | ||
| +++ src/json_wiki.c | ||
| @@ -72,10 +72,11 @@ | ||
| 72 | 72 | " AND b.rid=x.rid" |
| 73 | 73 | " ORDER BY x.mtime DESC LIMIT 1", |
| 74 | 74 | zPageName |
| 75 | 75 | ); |
| 76 | 76 | if( (SQLITE_ROW != db_step(&q)) ){ |
| 77 | + db_finalize(&q); | |
| 77 | 78 | return NULL; |
| 78 | 79 | } |
| 79 | 80 | rid = db_column_int(&q,0); |
| 80 | 81 | zUuid = db_column_malloc(&q,1); |
| 81 | 82 | db_finalize(&q); |
| @@ -83,12 +84,11 @@ | ||
| 83 | 84 | zBody = pWiki->zWiki; |
| 84 | 85 | } |
| 85 | 86 | |
| 86 | 87 | { |
| 87 | 88 | unsigned int len; |
| 88 | - cson_value * payV = cson_value_new_object(); | |
| 89 | - cson_object * pay = cson_value_get_object(payV); | |
| 89 | + cson_object * pay = cson_new_object(); | |
| 90 | 90 | cson_object_set(pay,"name",json_new_string(zPageName)); |
| 91 | 91 | cson_object_set(pay,"uuid",json_new_string(zUuid)); |
| 92 | 92 | free(zUuid); |
| 93 | 93 | zUuid = NULL; |
| 94 | 94 | /*cson_object_set(pay,"rid",json_new_int((cson_int_t)rid));*/ |
| @@ -113,11 +113,11 @@ | ||
| 113 | 113 | cson_object_set(pay,"content",cson_value_new_string(zBody,len)); |
| 114 | 114 | } |
| 115 | 115 | /*TODO: add 'T' (tag) fields*/ |
| 116 | 116 | /*TODO: add the 'A' card (file attachment) entries?*/ |
| 117 | 117 | manifest_destroy(pWiki); |
| 118 | - return payV; | |
| 118 | + return cson_object_value(pay); | |
| 119 | 119 | } |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | |
| 123 | 123 | /* |
| 124 | 124 |
| --- src/json_wiki.c | |
| +++ src/json_wiki.c | |
| @@ -72,10 +72,11 @@ | |
| 72 | " AND b.rid=x.rid" |
| 73 | " ORDER BY x.mtime DESC LIMIT 1", |
| 74 | zPageName |
| 75 | ); |
| 76 | if( (SQLITE_ROW != db_step(&q)) ){ |
| 77 | return NULL; |
| 78 | } |
| 79 | rid = db_column_int(&q,0); |
| 80 | zUuid = db_column_malloc(&q,1); |
| 81 | db_finalize(&q); |
| @@ -83,12 +84,11 @@ | |
| 83 | zBody = pWiki->zWiki; |
| 84 | } |
| 85 | |
| 86 | { |
| 87 | unsigned int len; |
| 88 | cson_value * payV = cson_value_new_object(); |
| 89 | cson_object * pay = cson_value_get_object(payV); |
| 90 | cson_object_set(pay,"name",json_new_string(zPageName)); |
| 91 | cson_object_set(pay,"uuid",json_new_string(zUuid)); |
| 92 | free(zUuid); |
| 93 | zUuid = NULL; |
| 94 | /*cson_object_set(pay,"rid",json_new_int((cson_int_t)rid));*/ |
| @@ -113,11 +113,11 @@ | |
| 113 | cson_object_set(pay,"content",cson_value_new_string(zBody,len)); |
| 114 | } |
| 115 | /*TODO: add 'T' (tag) fields*/ |
| 116 | /*TODO: add the 'A' card (file attachment) entries?*/ |
| 117 | manifest_destroy(pWiki); |
| 118 | return payV; |
| 119 | } |
| 120 | } |
| 121 | |
| 122 | |
| 123 | /* |
| 124 |
| --- src/json_wiki.c | |
| +++ src/json_wiki.c | |
| @@ -72,10 +72,11 @@ | |
| 72 | " AND b.rid=x.rid" |
| 73 | " ORDER BY x.mtime DESC LIMIT 1", |
| 74 | zPageName |
| 75 | ); |
| 76 | if( (SQLITE_ROW != db_step(&q)) ){ |
| 77 | db_finalize(&q); |
| 78 | return NULL; |
| 79 | } |
| 80 | rid = db_column_int(&q,0); |
| 81 | zUuid = db_column_malloc(&q,1); |
| 82 | db_finalize(&q); |
| @@ -83,12 +84,11 @@ | |
| 84 | zBody = pWiki->zWiki; |
| 85 | } |
| 86 | |
| 87 | { |
| 88 | unsigned int len; |
| 89 | cson_object * pay = cson_new_object(); |
| 90 | cson_object_set(pay,"name",json_new_string(zPageName)); |
| 91 | cson_object_set(pay,"uuid",json_new_string(zUuid)); |
| 92 | free(zUuid); |
| 93 | zUuid = NULL; |
| 94 | /*cson_object_set(pay,"rid",json_new_int((cson_int_t)rid));*/ |
| @@ -113,11 +113,11 @@ | |
| 113 | cson_object_set(pay,"content",cson_value_new_string(zBody,len)); |
| 114 | } |
| 115 | /*TODO: add 'T' (tag) fields*/ |
| 116 | /*TODO: add the 'A' card (file attachment) entries?*/ |
| 117 | manifest_destroy(pWiki); |
| 118 | return cson_object_value(pay); |
| 119 | } |
| 120 | } |
| 121 | |
| 122 | |
| 123 | /* |
| 124 |