BUG/MINOR: ist: only store NUL byte on succeeded alloc

The trailing NUL added at the end of istdup() by recent commit de0216758
("BUG/MINOR: ist: allocate nul byte on istdup") was placed outside of
the pointer validity test, rightfully showing null deref warnings. This
fix should be backported along with the fix above, to the same versions.

diff --git a/include/import/ist.h b/include/import/ist.h
index aff799dcb4227adc144a4c925c8f779aea77a6c3..e4e1425d6fd984c58ff569327e308d34c723a979 100644 (file)
--- a/include/import/ist.h
+++ b/include/import/ist.h
@@ -944,8 +944,8 @@ static inline struct ist istdup(const struct ist src)
 
        if (isttest(dst)) {
                istcpy(&dst, src, src.len);
+               dst.ptr[dst.len] = '\0';
        }
-       dst.ptr[dst.len] = '\0';
 
        return dst;
 }