summaryrefslogtreecommitdiff
path: root/http-push.c
diff options
context:
space:
mode:
authorEygene Ryabinkin <rea-git@codelabs.ru>2007-03-01 16:09:12 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-02 08:10:12 (GMT)
commiteecc8367f4eaafc8449fc08c4e33f3f8ac474469 (patch)
treeca045645ea44e54960e62c06186c2e490d3fdbea /http-push.c
parent0df56eabf2cde83cb63c4acd7da2346c34220ac0 (diff)
downloadgit-eecc8367f4eaafc8449fc08c4e33f3f8ac474469.zip
git-eecc8367f4eaafc8449fc08c4e33f3f8ac474469.tar.gz
git-eecc8367f4eaafc8449fc08c4e33f3f8ac474469.tar.bz2
Another memory overrun in http-push.c
Use of strlcpy() are wrong, as the source buffer at these locations may not be NUL-terminated.
Diffstat (limited to 'http-push.c')
-rw-r--r--http-push.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/http-push.c b/http-push.c
index cec7bf7..6af9aec 100644
--- a/http-push.c
+++ b/http-push.c
@@ -1271,7 +1271,9 @@ xml_cdata(void *userData, const XML_Char *s, int len)
struct xml_ctx *ctx = (struct xml_ctx *)userData;
free(ctx->cdata);
ctx->cdata = xmalloc(len + 1);
- strlcpy(ctx->cdata, s, len + 1);
+ /* NB: 's' is not null-terminated, can not use strlcpy here */
+ memcpy(ctx->cdata, s, len);
+ ctx->cdata[len] = '\0';
}
static struct remote_lock *lock_remote(const char *path, long timeout)
@@ -1473,7 +1475,8 @@ static void process_ls_object(struct remote_ls_ctx *ls)
return;
path += 8;
obj_hex = xmalloc(strlen(path));
- strlcpy(obj_hex, path, 3);
+ /* NB: path is not null-terminated, can not use strlcpy here */
+ memcpy(obj_hex, path, 2);
strcpy(obj_hex + 2, path + 3);
one_remote_object(obj_hex);
free(obj_hex);
@@ -2170,7 +2173,8 @@ static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
/* If it's a symref, set the refname; otherwise try for a sha1 */
if (!strncmp((char *)buffer.buffer, "ref: ", 5)) {
*symref = xmalloc(buffer.posn - 5);
- strlcpy(*symref, (char *)buffer.buffer + 5, buffer.posn - 5);
+ memcpy(*symref, (char *)buffer.buffer + 5, buffer.posn - 6);
+ (*symref)[buffer.posn - 6] = '\0';
} else {
get_sha1_hex(buffer.buffer, sha1);
}