Skip to content

Changes hit while testing with large data sets. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Changes hit while testing with large data sets. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f192f9
Fix a bug where zero length segments were not removed.
Sep 4, 2015
97821c3
Fix a problem with segment integer sizes wrapping (underflow).
Sep 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions lib/bsdiff/bsdiff_align.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
#include <stdlib.h>
#include <string.h>

#include "warnp.h"

#include "bsdiff_alignment.h"
#include "sufsort_qsufsort.h"

Expand Down Expand Up @@ -283,7 +285,7 @@ bsdiff_align(const uint8_t * new, size_t newsize,
if (old[i - 1 + (asegp2->opos - asegp2->npos)] == new[i - 1])
s++;
i--;
if (i + s >= asegp->npos + asegp->alen) {
if ((i + s >= asegp->npos + asegp->alen) && (i >= asegp->npos)) {
asegp->alen = i - asegp->npos;
s = 0;
}
Expand All @@ -294,7 +296,7 @@ bsdiff_align(const uint8_t * new, size_t newsize,
}

/* Delete any alignment segments which are now empty. */
for (k = j = 1; j + 1< bsdiff_alignment_getsize(A); j++) {
for (k = j = 0; j + 1< bsdiff_alignment_getsize(A); j++) {
asegp = bsdiff_alignment_get(A, k);
asegp2 = bsdiff_alignment_get(A, j + 1);

Expand All @@ -307,6 +309,17 @@ bsdiff_align(const uint8_t * new, size_t newsize,
}
bsdiff_alignment_shrink(A, j - k);

/* Warn about any bad alignment lengths */
for (j = 0; j < bsdiff_alignment_getsize(A); j++) {
asegp = bsdiff_alignment_get(A, j);
if (asegp->alen == 0)
warnp("bsdiff_align: A[%lu] asegp->alen is zero");
else if (asegp->alen > (0x8000000000000000L))
/* Larger than 2^63 */
warnp("bsdiff_align: A[%lu] huge segment asegp->alen %lu",
j, asegp->alen);
}

/* Free the suffix array. */
free(I);

Expand Down
18 changes: 14 additions & 4 deletions lib/bsdiff/bsdiff_align_multi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ bsdiff_align_multi(const uint8_t * new, size_t newsize, const uint8_t * old,
size_t i, j;
BSDIFF_ALIGNMENT * BA;
BSDIFF_ALIGNMENT A;
struct bsdiff_alignseg * asegp;

/* Index the old file. */
printf("Indexing old file...\n");
Expand Down Expand Up @@ -184,10 +185,19 @@ bsdiff_align_multi(const uint8_t * new, size_t newsize, const uint8_t * old,
for (i = 0; i < nblocks; i++) {
/* Add these alignment segments to the whole-file alignment. */
for (j = 0; j < bsdiff_alignment_getsize(BA[i]); j++) {
if (bsdiff_alignment_append(A,
bsdiff_alignment_get(BA[i], j), 1)) {
warnp("bsdiff_alignment_append");
goto err3;
asegp = bsdiff_alignment_get(BA[i], j);
if (asegp->alen) {
if (asegp->alen > 0x8000000000000000L)
/* Larger than 2^63 */
warnp("bsdiff_alignment_append: BA[%lu] segment size %lu",
i, asegp->alen);
if (bsdiff_alignment_append(A,
bsdiff_alignment_get(BA[i], j), 1)) {
warnp("bsdiff_alignment_append");
goto err3;
}
} else {
warnp("bsdiff_alignment_append: skipped zero length alignment at BA[%lu]", i);
}
}
}
Expand Down