Fossil SCM
Ensure that inputs to delta_create() are always memory aligned as if obtained from malloc().
Commit
c91e48714012c62d33055bb0812bae6b8f99cad5
Parent
4ede0df9df8f49c…
1 file changed
+3
-3
+3
-3
| --- src/deltacmd.c | ||
| +++ src/deltacmd.c | ||
| @@ -29,16 +29,16 @@ | ||
| 29 | 29 | const char *zOrig, *zTarg; |
| 30 | 30 | int lenOrig, lenTarg; |
| 31 | 31 | int len; |
| 32 | 32 | char *zRes; |
| 33 | 33 | blob_zero(pDelta); |
| 34 | - zOrig = blob_buffer(pOriginal); | |
| 34 | + zOrig = blob_materialize(pOriginal); | |
| 35 | 35 | lenOrig = blob_size(pOriginal); |
| 36 | - zTarg = blob_buffer(pTarget); | |
| 36 | + zTarg = blob_materialize(pTarget); | |
| 37 | 37 | lenTarg = blob_size(pTarget); |
| 38 | 38 | blob_resize(pDelta, lenTarg+16); |
| 39 | - zRes = blob_buffer(pDelta); | |
| 39 | + zRes = blob_materialize(pDelta); | |
| 40 | 40 | len = delta_create(zOrig, lenOrig, zTarg, lenTarg, zRes); |
| 41 | 41 | blob_resize(pDelta, len); |
| 42 | 42 | return 0; |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 |
| --- src/deltacmd.c | |
| +++ src/deltacmd.c | |
| @@ -29,16 +29,16 @@ | |
| 29 | const char *zOrig, *zTarg; |
| 30 | int lenOrig, lenTarg; |
| 31 | int len; |
| 32 | char *zRes; |
| 33 | blob_zero(pDelta); |
| 34 | zOrig = blob_buffer(pOriginal); |
| 35 | lenOrig = blob_size(pOriginal); |
| 36 | zTarg = blob_buffer(pTarget); |
| 37 | lenTarg = blob_size(pTarget); |
| 38 | blob_resize(pDelta, lenTarg+16); |
| 39 | zRes = blob_buffer(pDelta); |
| 40 | len = delta_create(zOrig, lenOrig, zTarg, lenTarg, zRes); |
| 41 | blob_resize(pDelta, len); |
| 42 | return 0; |
| 43 | } |
| 44 | |
| 45 |
| --- src/deltacmd.c | |
| +++ src/deltacmd.c | |
| @@ -29,16 +29,16 @@ | |
| 29 | const char *zOrig, *zTarg; |
| 30 | int lenOrig, lenTarg; |
| 31 | int len; |
| 32 | char *zRes; |
| 33 | blob_zero(pDelta); |
| 34 | zOrig = blob_materialize(pOriginal); |
| 35 | lenOrig = blob_size(pOriginal); |
| 36 | zTarg = blob_materialize(pTarget); |
| 37 | lenTarg = blob_size(pTarget); |
| 38 | blob_resize(pDelta, lenTarg+16); |
| 39 | zRes = blob_materialize(pDelta); |
| 40 | len = delta_create(zOrig, lenOrig, zTarg, lenTarg, zRes); |
| 41 | blob_resize(pDelta, len); |
| 42 | return 0; |
| 43 | } |
| 44 | |
| 45 |