From: Joerg Sonnenberger <joerg@bec.de>
Date: Sat, 29 Apr 2017 13:50:24 +0000 (+0200)
Subject: Redo 1e660621b4b00eaf4ef7a508aedf52c5a421bd2e, only skip the memmove.
X-Git-Tag: v3.3.2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee479f802046f7f3fd8dd1f3f4a58c94bb6b2e2a;p=thirdparty%2Flibarchive.git

Redo 1e660621b4b00eaf4ef7a508aedf52c5a421bd2e, only skip the memmove.
---

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index ca39c069a..5ae09b626 100644
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -200,11 +200,10 @@ static int archive_string_append_unicode(struct archive_string *,
 static struct archive_string *
 archive_string_append(struct archive_string *as, const char *p, size_t s)
 {
-	if (s == 0)
-		return (as);
 	if (archive_string_ensure(as, as->length + s + 1) == NULL)
 		return (NULL);
-	memmove(as->s + as->length, p, s);
+	if (s)
+		memmove(as->s + as->length, p, s);
 	as->length += s;
 	as->s[as->length] = 0;
 	return (as);