Check the position before dereferencing the pointer.

This avoids dereferencing one byte past the end of a string.

SVN-Revision: 3799

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index 4e57d62e1383281067bc38dd193d6fa482e32405..95bed6eda39b5aa25ffdb58e4bbbba7d3f786a24 100644 (file)
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -152,7 +152,7 @@ __archive_strncat(struct archive_string *as, const void *_p, size_t n)
        /* Like strlen(p), except won't examine positions beyond p[n]. */
        s = 0;
        pp = p;
-       while (*pp && s < n) {
+       while (s < n && *pp) {
                pp++;
                s++;
        }