Fossil SCM

Cherrypicked [92221aaa192e82] and [7283ae6e120c10] on behalf of George.

stephan 2022-02-09 20:23 trunk
Commit f902814db6f76ccd9a5d400e4625b57b14fb71cd141223ae6013e9881e5b3520
Parent 487e465263fd21c…
3 files changed +3 -3 +3 -3 +3 -3
~ src/blob.c ~ src/blob.c ~ src/blob.c
M src/blob.c
+3 -3
--- src/blob.c
+++ src/blob.c
@@ -164,11 +164,11 @@
164164
 pBlob->aData = 0;
165165
 pBlob->nAlloc = 0;
166166
 pBlob->nUsed = 0;
167167
 pBlob->iCursor = 0;
168168
 pBlob->blobFlags = 0;
169
- }else if( newSize>pBlob->nAlloc || newSize<pBlob->nAlloc-4000 ){
169
+ }else if( newSize>pBlob->nAlloc || newSize+4000<pBlob->nAlloc ){
170170
 char *pNew = fossil_realloc(pBlob->aData, newSize);
171171
 pBlob->aData = pNew;
172172
 pBlob->nAlloc = newSize;
173173
 if( pBlob->nUsed>pBlob->nAlloc ){
174174
 pBlob->nUsed = pBlob->nAlloc;
@@ -595,12 +595,12 @@
595595
 ** builds.
596596
 */
597597
 void blob_reserve(Blob *pBlob, unsigned int newSize){
598598
 if(newSize>=0x7fff0000 ){
599599
 blob_panic();
600
- }else if(newSize>pBlob->nUsed){
601
- pBlob->xRealloc(pBlob, newSize);
600
+ }else if(newSize>pBlob->nAlloc){
601
+ pBlob->xRealloc(pBlob, newSize+1);
602602
 pBlob->aData[newSize] = 0;
603603
 }
604604
 }
605605
606606
 /*
607607
--- src/blob.c
+++ src/blob.c
@@ -164,11 +164,11 @@
164 pBlob->aData = 0;
165 pBlob->nAlloc = 0;
166 pBlob->nUsed = 0;
167 pBlob->iCursor = 0;
168 pBlob->blobFlags = 0;
169 }else if( newSize>pBlob->nAlloc || newSize<pBlob->nAlloc-4000 ){
170 char *pNew = fossil_realloc(pBlob->aData, newSize);
171 pBlob->aData = pNew;
172 pBlob->nAlloc = newSize;
173 if( pBlob->nUsed>pBlob->nAlloc ){
174 pBlob->nUsed = pBlob->nAlloc;
@@ -595,12 +595,12 @@
595 ** builds.
596 */
597 void blob_reserve(Blob *pBlob, unsigned int newSize){
598 if(newSize>=0x7fff0000 ){
599 blob_panic();
600 }else if(newSize>pBlob->nUsed){
601 pBlob->xRealloc(pBlob, newSize);
602 pBlob->aData[newSize] = 0;
603 }
604 }
605
606 /*
607
--- src/blob.c
+++ src/blob.c
@@ -164,11 +164,11 @@
164 pBlob->aData = 0;
165 pBlob->nAlloc = 0;
166 pBlob->nUsed = 0;
167 pBlob->iCursor = 0;
168 pBlob->blobFlags = 0;
169 }else if( newSize>pBlob->nAlloc || newSize+4000<pBlob->nAlloc ){
170 char *pNew = fossil_realloc(pBlob->aData, newSize);
171 pBlob->aData = pNew;
172 pBlob->nAlloc = newSize;
173 if( pBlob->nUsed>pBlob->nAlloc ){
174 pBlob->nUsed = pBlob->nAlloc;
@@ -595,12 +595,12 @@
595 ** builds.
596 */
597 void blob_reserve(Blob *pBlob, unsigned int newSize){
598 if(newSize>=0x7fff0000 ){
599 blob_panic();
600 }else if(newSize>pBlob->nAlloc){
601 pBlob->xRealloc(pBlob, newSize+1);
602 pBlob->aData[newSize] = 0;
603 }
604 }
605
606 /*
607
M src/blob.c
+3 -3
--- src/blob.c
+++ src/blob.c
@@ -164,11 +164,11 @@
164164
 pBlob->aData = 0;
165165
 pBlob->nAlloc = 0;
166166
 pBlob->nUsed = 0;
167167
 pBlob->iCursor = 0;
168168
 pBlob->blobFlags = 0;
169
- }else if( newSize>pBlob->nAlloc || newSize<pBlob->nAlloc-4000 ){
169
+ }else if( newSize>pBlob->nAlloc || newSize+4000<pBlob->nAlloc ){
170170
 char *pNew = fossil_realloc(pBlob->aData, newSize);
171171
 pBlob->aData = pNew;
172172
 pBlob->nAlloc = newSize;
173173
 if( pBlob->nUsed>pBlob->nAlloc ){
174174
 pBlob->nUsed = pBlob->nAlloc;
@@ -595,12 +595,12 @@
595595
 ** builds.
596596
 */
597597
 void blob_reserve(Blob *pBlob, unsigned int newSize){
598598
 if(newSize>=0x7fff0000 ){
599599
 blob_panic();
600
- }else if(newSize>pBlob->nUsed){
601
- pBlob->xRealloc(pBlob, newSize);
600
+ }else if(newSize>pBlob->nAlloc){
601
+ pBlob->xRealloc(pBlob, newSize+1);
602602
 pBlob->aData[newSize] = 0;
603603
 }
604604
 }
605605
606606
 /*
607607
--- src/blob.c
+++ src/blob.c
@@ -164,11 +164,11 @@
164 pBlob->aData = 0;
165 pBlob->nAlloc = 0;
166 pBlob->nUsed = 0;
167 pBlob->iCursor = 0;
168 pBlob->blobFlags = 0;
169 }else if( newSize>pBlob->nAlloc || newSize<pBlob->nAlloc-4000 ){
170 char *pNew = fossil_realloc(pBlob->aData, newSize);
171 pBlob->aData = pNew;
172 pBlob->nAlloc = newSize;
173 if( pBlob->nUsed>pBlob->nAlloc ){
174 pBlob->nUsed = pBlob->nAlloc;
@@ -595,12 +595,12 @@
595 ** builds.
596 */
597 void blob_reserve(Blob *pBlob, unsigned int newSize){
598 if(newSize>=0x7fff0000 ){
599 blob_panic();
600 }else if(newSize>pBlob->nUsed){
601 pBlob->xRealloc(pBlob, newSize);
602 pBlob->aData[newSize] = 0;
603 }
604 }
605
606 /*
607
--- src/blob.c
+++ src/blob.c
@@ -164,11 +164,11 @@
164 pBlob->aData = 0;
165 pBlob->nAlloc = 0;
166 pBlob->nUsed = 0;
167 pBlob->iCursor = 0;
168 pBlob->blobFlags = 0;
169 }else if( newSize>pBlob->nAlloc || newSize+4000<pBlob->nAlloc ){
170 char *pNew = fossil_realloc(pBlob->aData, newSize);
171 pBlob->aData = pNew;
172 pBlob->nAlloc = newSize;
173 if( pBlob->nUsed>pBlob->nAlloc ){
174 pBlob->nUsed = pBlob->nAlloc;
@@ -595,12 +595,12 @@
595 ** builds.
596 */
597 void blob_reserve(Blob *pBlob, unsigned int newSize){
598 if(newSize>=0x7fff0000 ){
599 blob_panic();
600 }else if(newSize>pBlob->nAlloc){
601 pBlob->xRealloc(pBlob, newSize+1);
602 pBlob->aData[newSize] = 0;
603 }
604 }
605
606 /*
607
M src/blob.c
+3 -3
--- src/blob.c
+++ src/blob.c
@@ -164,11 +164,11 @@
164164
 pBlob->aData = 0;
165165
 pBlob->nAlloc = 0;
166166
 pBlob->nUsed = 0;
167167
 pBlob->iCursor = 0;
168168
 pBlob->blobFlags = 0;
169
- }else if( newSize>pBlob->nAlloc || newSize<pBlob->nAlloc-4000 ){
169
+ }else if( newSize>pBlob->nAlloc || newSize+4000<pBlob->nAlloc ){
170170
 char *pNew = fossil_realloc(pBlob->aData, newSize);
171171
 pBlob->aData = pNew;
172172
 pBlob->nAlloc = newSize;
173173
 if( pBlob->nUsed>pBlob->nAlloc ){
174174
 pBlob->nUsed = pBlob->nAlloc;
@@ -595,12 +595,12 @@
595595
 ** builds.
596596
 */
597597
 void blob_reserve(Blob *pBlob, unsigned int newSize){
598598
 if(newSize>=0x7fff0000 ){
599599
 blob_panic();
600
- }else if(newSize>pBlob->nUsed){
601
- pBlob->xRealloc(pBlob, newSize);
600
+ }else if(newSize>pBlob->nAlloc){
601
+ pBlob->xRealloc(pBlob, newSize+1);
602602
 pBlob->aData[newSize] = 0;
603603
 }
604604
 }
605605
606606
 /*
607607
--- src/blob.c
+++ src/blob.c
@@ -164,11 +164,11 @@
164 pBlob->aData = 0;
165 pBlob->nAlloc = 0;
166 pBlob->nUsed = 0;
167 pBlob->iCursor = 0;
168 pBlob->blobFlags = 0;
169 }else if( newSize>pBlob->nAlloc || newSize<pBlob->nAlloc-4000 ){
170 char *pNew = fossil_realloc(pBlob->aData, newSize);
171 pBlob->aData = pNew;
172 pBlob->nAlloc = newSize;
173 if( pBlob->nUsed>pBlob->nAlloc ){
174 pBlob->nUsed = pBlob->nAlloc;
@@ -595,12 +595,12 @@
595 ** builds.
596 */
597 void blob_reserve(Blob *pBlob, unsigned int newSize){
598 if(newSize>=0x7fff0000 ){
599 blob_panic();
600 }else if(newSize>pBlob->nUsed){
601 pBlob->xRealloc(pBlob, newSize);
602 pBlob->aData[newSize] = 0;
603 }
604 }
605
606 /*
607
--- src/blob.c
+++ src/blob.c
@@ -164,11 +164,11 @@
164 pBlob->aData = 0;
165 pBlob->nAlloc = 0;
166 pBlob->nUsed = 0;
167 pBlob->iCursor = 0;
168 pBlob->blobFlags = 0;
169 }else if( newSize>pBlob->nAlloc || newSize+4000<pBlob->nAlloc ){
170 char *pNew = fossil_realloc(pBlob->aData, newSize);
171 pBlob->aData = pNew;
172 pBlob->nAlloc = newSize;
173 if( pBlob->nUsed>pBlob->nAlloc ){
174 pBlob->nUsed = pBlob->nAlloc;
@@ -595,12 +595,12 @@
595 ** builds.
596 */
597 void blob_reserve(Blob *pBlob, unsigned int newSize){
598 if(newSize>=0x7fff0000 ){
599 blob_panic();
600 }else if(newSize>pBlob->nAlloc){
601 pBlob->xRealloc(pBlob, newSize+1);
602 pBlob->aData[newSize] = 0;
603 }
604 }
605
606 /*
607

Keyboard Shortcuts

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