Fossil SCM
Fix an invalid free() call that could occur when the "info" command was used with an invalid artifact ID. Ticket [aa8ba0fffa].
Commit
9d3fe01ae333adcea94acb637f8a8a5f40acb280
Parent
06b964a0cf6d988…
1 file changed
+2
-2
+2
-2
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -62,16 +62,16 @@ | ||
| 62 | 62 | char *zTags; |
| 63 | 63 | char *zDate; |
| 64 | 64 | char *zUuid; |
| 65 | 65 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 66 | 66 | if( zUuid ){ |
| 67 | - zDate = db_text("", | |
| 67 | + zDate = db_text(0, | |
| 68 | 68 | "SELECT datetime(mtime) || ' UTC' FROM event WHERE objid=%d", |
| 69 | 69 | rid |
| 70 | 70 | ); |
| 71 | 71 | /* 01234567890123 */ |
| 72 | - printf("%-13s %s %s\n", zUuidName, zUuid, zDate); | |
| 72 | + printf("%-13s %s %s\n", zUuidName, zUuid, zDate ? zDate : ""); | |
| 73 | 73 | free(zUuid); |
| 74 | 74 | free(zDate); |
| 75 | 75 | } |
| 76 | 76 | db_prepare(&q, "SELECT uuid, pid FROM plink JOIN blob ON pid=rid " |
| 77 | 77 | " WHERE cid=%d", rid); |
| 78 | 78 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -62,16 +62,16 @@ | |
| 62 | char *zTags; |
| 63 | char *zDate; |
| 64 | char *zUuid; |
| 65 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 66 | if( zUuid ){ |
| 67 | zDate = db_text("", |
| 68 | "SELECT datetime(mtime) || ' UTC' FROM event WHERE objid=%d", |
| 69 | rid |
| 70 | ); |
| 71 | /* 01234567890123 */ |
| 72 | printf("%-13s %s %s\n", zUuidName, zUuid, zDate); |
| 73 | free(zUuid); |
| 74 | free(zDate); |
| 75 | } |
| 76 | db_prepare(&q, "SELECT uuid, pid FROM plink JOIN blob ON pid=rid " |
| 77 | " WHERE cid=%d", rid); |
| 78 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -62,16 +62,16 @@ | |
| 62 | char *zTags; |
| 63 | char *zDate; |
| 64 | char *zUuid; |
| 65 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 66 | if( zUuid ){ |
| 67 | zDate = db_text(0, |
| 68 | "SELECT datetime(mtime) || ' UTC' FROM event WHERE objid=%d", |
| 69 | rid |
| 70 | ); |
| 71 | /* 01234567890123 */ |
| 72 | printf("%-13s %s %s\n", zUuidName, zUuid, zDate ? zDate : ""); |
| 73 | free(zUuid); |
| 74 | free(zDate); |
| 75 | } |
| 76 | db_prepare(&q, "SELECT uuid, pid FROM plink JOIN blob ON pid=rid " |
| 77 | " WHERE cid=%d", rid); |
| 78 |