projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pe/date'
[git.git]
/
http-fetch.c
diff --git
a/http-fetch.c
b/http-fetch.c
index
d3602b7
..
da1a7f5
100644
(file)
--- 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);
// 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);
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);
struct xml_ctx *ctx = (struct xml_ctx *)userData;
if (ctx->cdata)
free(ctx->cdata);
- ctx->cdata = x
calloc(len+1,
1);
- s
trncpy(ctx->cdata, s, len
);
+ ctx->cdata = x
malloc(len +
1);
+ s
afe_strncpy(ctx->cdata, s, len + 1
);
}
static int remote_ls(struct alt_base *repo, const char *path, int flags,
}
static int remote_ls(struct alt_base *repo, const char *path, int flags,