X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=http-fetch.c;h=da1a7f5416a4bf3a633d3577382984f528694a78;hp=d3602b7d7d820a37b6395a7aeb96a8dc8368a646;hb=bfbd0bb6ecbbbf75a5caaff6afaf5a6af8fa518e;hpb=5996ca0836e21ab4e6be0a16a615eff965f18b8b

diff --git a/http-fetch.c b/http-fetch.c
index d3602b7d..da1a7f54 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,