Fossil SCM
Picking recent trunk fixes on tickets.
Commit
7a8ed6d7df6b2149c76d610c5da759fb4d572bea
Parent
1b07b3d9b26d01b…
2 files changed
+1
-1
+3
-1
+1
-1
| --- src/cson_amalgamation.c | ||
| +++ src/cson_amalgamation.c | ||
| @@ -4349,11 +4349,11 @@ | ||
| 4349 | 4349 | { |
| 4350 | 4350 | return 0; |
| 4351 | 4351 | } |
| 4352 | 4352 | else |
| 4353 | 4353 | { |
| 4354 | - unsigned char * x = (unsigned char *)realloc( buf->mem, n ); | |
| 4354 | + unsigned char * x = (unsigned char *)cson_realloc( buf->mem, n, "cson_buffer::mem" ); | |
| 4355 | 4355 | if( ! x ) return cson_rc.AllocError; |
| 4356 | 4356 | memset( x + buf->used, 0, n - buf->used ); |
| 4357 | 4357 | buf->mem = x; |
| 4358 | 4358 | buf->capacity = n; |
| 4359 | 4359 | ++buf->timesExpanded; |
| 4360 | 4360 |
| --- src/cson_amalgamation.c | |
| +++ src/cson_amalgamation.c | |
| @@ -4349,11 +4349,11 @@ | |
| 4349 | { |
| 4350 | return 0; |
| 4351 | } |
| 4352 | else |
| 4353 | { |
| 4354 | unsigned char * x = (unsigned char *)realloc( buf->mem, n ); |
| 4355 | if( ! x ) return cson_rc.AllocError; |
| 4356 | memset( x + buf->used, 0, n - buf->used ); |
| 4357 | buf->mem = x; |
| 4358 | buf->capacity = n; |
| 4359 | ++buf->timesExpanded; |
| 4360 |
| --- src/cson_amalgamation.c | |
| +++ src/cson_amalgamation.c | |
| @@ -4349,11 +4349,11 @@ | |
| 4349 | { |
| 4350 | return 0; |
| 4351 | } |
| 4352 | else |
| 4353 | { |
| 4354 | unsigned char * x = (unsigned char *)cson_realloc( buf->mem, n, "cson_buffer::mem" ); |
| 4355 | if( ! x ) return cson_rc.AllocError; |
| 4356 | memset( x + buf->used, 0, n - buf->used ); |
| 4357 | buf->mem = x; |
| 4358 | buf->capacity = n; |
| 4359 | ++buf->timesExpanded; |
| 4360 |
+3
-1
| --- src/tkt.c | ||
| +++ src/tkt.c | ||
| @@ -210,11 +210,13 @@ | ||
| 210 | 210 | } |
| 211 | 211 | aUsed = fossil_malloc( nField ); |
| 212 | 212 | memset(aUsed, 0, nField); |
| 213 | 213 | for(i=0; i<p->nField; i++){ |
| 214 | 214 | const char *zName = p->aField[i].zName; |
| 215 | - if( (j = fieldId(zName))<0 ) continue; | |
| 215 | + const char *zBaseName = zName[0]=='+' ? zName+1 : zName; | |
| 216 | + j = fieldId(zBaseName); | |
| 217 | + if( j<0 ) continue; | |
| 216 | 218 | aUsed[j] = 1; |
| 217 | 219 | if( aField[j].mUsed & USEDBY_TICKET ){ |
| 218 | 220 | if( zName[0]=='+' ){ |
| 219 | 221 | zName++; |
| 220 | 222 | blob_appendf(&sql1,", %s=coalesce(%s,'') || %Q", |
| 221 | 223 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -210,11 +210,13 @@ | |
| 210 | } |
| 211 | aUsed = fossil_malloc( nField ); |
| 212 | memset(aUsed, 0, nField); |
| 213 | for(i=0; i<p->nField; i++){ |
| 214 | const char *zName = p->aField[i].zName; |
| 215 | if( (j = fieldId(zName))<0 ) continue; |
| 216 | aUsed[j] = 1; |
| 217 | if( aField[j].mUsed & USEDBY_TICKET ){ |
| 218 | if( zName[0]=='+' ){ |
| 219 | zName++; |
| 220 | blob_appendf(&sql1,", %s=coalesce(%s,'') || %Q", |
| 221 |
| --- src/tkt.c | |
| +++ src/tkt.c | |
| @@ -210,11 +210,13 @@ | |
| 210 | } |
| 211 | aUsed = fossil_malloc( nField ); |
| 212 | memset(aUsed, 0, nField); |
| 213 | for(i=0; i<p->nField; i++){ |
| 214 | const char *zName = p->aField[i].zName; |
| 215 | const char *zBaseName = zName[0]=='+' ? zName+1 : zName; |
| 216 | j = fieldId(zBaseName); |
| 217 | if( j<0 ) continue; |
| 218 | aUsed[j] = 1; |
| 219 | if( aField[j].mUsed & USEDBY_TICKET ){ |
| 220 | if( zName[0]=='+' ){ |
| 221 | zName++; |
| 222 | blob_appendf(&sql1,", %s=coalesce(%s,'') || %Q", |
| 223 |