diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-17 17:08:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-17 17:08:36 -0700 |
| commit | fc5201ac9f17abf8b70b248b17595f3f3d35c056 (patch) | |
| tree | 59d1b7aa95bddfce3c535e8a3c752ef9298ff632 /http-fetch.c | |
| parent | ada5853c98c5c0ad84a990cc6ee7365a14555c0f (diff) | |
| parent | cd112cef999c59a7ca2a96c37b197d303a355924 (diff) | |
| download | git-fc5201ac9f17abf8b70b248b17595f3f3d35c056.tar.gz | |
Merge branch 'js/diff'
Diffstat (limited to 'http-fetch.c')
| -rw-r--r-- | http-fetch.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/http-fetch.c b/http-fetch.c index d3602b7d7d..da1a7f5416 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -584,10 +584,8 @@ static void process_alternates_response(void *callback_data) // skip 'objects' at end if (okay) { target = xmalloc(serverlen + posn - i - 6); - strncpy(target, base, serverlen); - strncpy(target + serverlen, data + i, - posn - i - 7); - target[serverlen + posn - i - 7] = '\0'; + safe_strncpy(target, base, serverlen); + safe_strncpy(target + serverlen, data + i, posn - i - 6); if (get_verbosely) fprintf(stderr, "Also look at %s\n", target); @@ -728,8 +726,8 @@ xml_cdata(void *userData, const XML_Char *s, int len) struct xml_ctx *ctx = (struct xml_ctx *)userData; if (ctx->cdata) free(ctx->cdata); - ctx->cdata = xcalloc(len+1, 1); - strncpy(ctx->cdata, s, len); + ctx->cdata = xmalloc(len + 1); + safe_strncpy(ctx->cdata, s, len + 1); } static int remote_ls(struct alt_base *repo, const char *path, int flags, |