Fossil SCM
Avoid SQL errors when the "fossil ticket" command is misused to try to append icomment text.
Commit
878f7008ab86e24a828a772bfc0f411e4aa6dc36
Parent
93f370a80c5f4cc…
1 file changed
+4
-2
+4
-2
| --- src/tkt.c | ||
| +++ src/tkt.c | ||
| @@ -247,13 +247,15 @@ | ||
| 247 | 247 | } |
| 248 | 248 | for(i=0; i<nField; i++){ |
| 249 | 249 | if( aUsed[i]==0 |
| 250 | 250 | && (aField[i].mUsed & USEDBY_BOTH)==USEDBY_BOTH |
| 251 | 251 | ){ |
| 252 | + const char *z = aField[i].zName; | |
| 253 | + if( z[0]=='+' ) z++; | |
| 252 | 254 | fromTkt = 1; |
| 253 | - blob_appendf(&sql2, ",%s", aField[i].zName); | |
| 254 | - blob_appendf(&sql3, ",%s", aField[i].zName); | |
| 255 | + blob_appendf(&sql2, ",%s", z); | |
| 256 | + blob_appendf(&sql3, ",%s", z); | |
| 255 | 257 | } |
| 256 | 258 | } |
| 257 | 259 | if( fromTkt ){ |
| 258 | 260 | db_prepare(&q, "INSERT INTO ticketchng(tkt_id,tkt_mtime%s)" |
| 259 | 261 | "SELECT %d,:mtime%s FROM ticket WHERE tkt_id=%d", |
| 260 | 262 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -247,13 +247,15 @@ | |
| 247 | } |
| 248 | for(i=0; i<nField; i++){ |
| 249 | if( aUsed[i]==0 |
| 250 | && (aField[i].mUsed & USEDBY_BOTH)==USEDBY_BOTH |
| 251 | ){ |
| 252 | fromTkt = 1; |
| 253 | blob_appendf(&sql2, ",%s", aField[i].zName); |
| 254 | blob_appendf(&sql3, ",%s", aField[i].zName); |
| 255 | } |
| 256 | } |
| 257 | if( fromTkt ){ |
| 258 | db_prepare(&q, "INSERT INTO ticketchng(tkt_id,tkt_mtime%s)" |
| 259 | "SELECT %d,:mtime%s FROM ticket WHERE tkt_id=%d", |
| 260 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -247,13 +247,15 @@ | |
| 247 | } |
| 248 | for(i=0; i<nField; i++){ |
| 249 | if( aUsed[i]==0 |
| 250 | && (aField[i].mUsed & USEDBY_BOTH)==USEDBY_BOTH |
| 251 | ){ |
| 252 | const char *z = aField[i].zName; |
| 253 | if( z[0]=='+' ) z++; |
| 254 | fromTkt = 1; |
| 255 | blob_appendf(&sql2, ",%s", z); |
| 256 | blob_appendf(&sql3, ",%s", z); |
| 257 | } |
| 258 | } |
| 259 | if( fromTkt ){ |
| 260 | db_prepare(&q, "INSERT INTO ticketchng(tkt_id,tkt_mtime%s)" |
| 261 | "SELECT %d,:mtime%s FROM ticket WHERE tkt_id=%d", |
| 262 |