Fossil SCM

Integrate change to disallow passing in a NULL pointer to blob_append.

andybradford 2015-08-07 05:15 trunk merge
Commit dd75bc574d67a2fd268f3fa8624332c39adcd451
1 file changed +1
+1
--- src/blob.c
+++ src/blob.c
@@ -271,10 +271,11 @@
271271
272272
/*
273273
** Append text or data to the end of a blob.
274274
*/
275275
void blob_append(Blob *pBlob, const char *aData, int nData){
276
+ assert( aData!=0 );
276277
blob_is_init(pBlob);
277278
if( nData<0 ) nData = strlen(aData);
278279
if( nData==0 ) return;
279280
if( pBlob->nUsed + nData >= pBlob->nAlloc ){
280281
pBlob->xRealloc(pBlob, pBlob->nUsed + nData + pBlob->nAlloc + 100);
281282
--- src/blob.c
+++ src/blob.c
@@ -271,10 +271,11 @@
271
272 /*
273 ** Append text or data to the end of a blob.
274 */
275 void blob_append(Blob *pBlob, const char *aData, int nData){
 
276 blob_is_init(pBlob);
277 if( nData<0 ) nData = strlen(aData);
278 if( nData==0 ) return;
279 if( pBlob->nUsed + nData >= pBlob->nAlloc ){
280 pBlob->xRealloc(pBlob, pBlob->nUsed + nData + pBlob->nAlloc + 100);
281
--- src/blob.c
+++ src/blob.c
@@ -271,10 +271,11 @@
271
272 /*
273 ** Append text or data to the end of a blob.
274 */
275 void blob_append(Blob *pBlob, const char *aData, int nData){
276 assert( aData!=0 );
277 blob_is_init(pBlob);
278 if( nData<0 ) nData = strlen(aData);
279 if( nData==0 ) return;
280 if( pBlob->nUsed + nData >= pBlob->nAlloc ){
281 pBlob->xRealloc(pBlob, pBlob->nUsed + nData + pBlob->nAlloc + 100);
282

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button