undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make patch_delta() error cases a bit more verbose

Browse Source 
It is especially important to distinguish between a malloc() failure
from all the other cases.  An out of memory condition is much less
worrisome than a compatibility/corruption problem.

Also make test-delta compilable again.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Nicolas Pitre 2006-12-18 16:06:50 -05:00 committed by Junio C Hamano
parent e1bb1d31ea
commit 57b73150c4
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -796,8 +796,8 @@ test: all
test-date$X: test-date.c date.o ctype.o test-date$X: test-date.c date.o ctype.o
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) test-date.c date.o ctype.o $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) test-date.c date.o ctype.o
test-delta$X: test-delta.c diff-delta.o patch-delta.o test-delta$X: test-delta.o diff-delta.o patch-delta.o $(GITLIBS)
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^ $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS) test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS)
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)

13
patch-delta.c
View File

@ -9,8 +9,7 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <stdlib.h> #include "git-compat-util.h"
#include <string.h>
#include "delta.h" #include "delta.h"
void *patch_delta(const void *src_buf, unsigned long src_size, void *patch_delta(const void *src_buf, unsigned long src_size,
@ -34,9 +33,7 @@ void *patch_delta(const void *src_buf, unsigned long src_size,
/* now the result size */ /* now the result size */
size = get_delta_hdr_size(&data, top); size = get_delta_hdr_size(&data, top);
dst_buf = malloc(size + 1); dst_buf = xmalloc(size + 1);
if (!dst_buf)
return NULL;
dst_buf[size] = 0; dst_buf[size] = 0;
out = dst_buf; out = dst_buf;
@ -55,13 +52,13 @@ void *patch_delta(const void *src_buf, unsigned long src_size,
if (cp_off + cp_size < cp_size || if (cp_off + cp_size < cp_size ||
cp_off + cp_size > src_size || cp_off + cp_size > src_size ||
cp_size > size) cp_size > size)
goto bad; break;
memcpy(out, (char *) src_buf + cp_off, cp_size); memcpy(out, (char *) src_buf + cp_off, cp_size);
out += cp_size; out += cp_size;
size -= cp_size; size -= cp_size;
} else if (cmd) { } else if (cmd) {
if (cmd > size) if (cmd > size)
goto bad; break;
memcpy(out, data, cmd); memcpy(out, data, cmd);
out += cmd; out += cmd;
data += cmd; data += cmd;
@ -72,12 +69,14 @@ void *patch_delta(const void *src_buf, unsigned long src_size,
* extensions. In the mean time we must fail when * extensions. In the mean time we must fail when
* encountering them (might be data corruption). * encountering them (might be data corruption).
*/ */
error("unexpected delta opcode 0");
goto bad; goto bad;
} }
} }
/* sanity check */ /* sanity check */
if (data != top || size != 0) { if (data != top || size != 0) {
error("delta replay has gone wild");
bad: bad:
free(dst_buf); free(dst_buf);
return NULL; return NULL;