Merge branch 'dev' into tiff32float

2017-12-20 00:21:23 +01:00
parent 5ea5cfd943 d1d91869c8
commit 157da7f9ba
113 changed files with 7809 additions and 9781 deletions
--- a/rtexif/rtexif.cc
+++ b/rtexif/rtexif.cc
@@ -1671,7 +1671,7 @@ void Tag::toString (char* buffer, int ofs)

    strcpy (buffer, "");

-    for (size_t i = 0; i < maxcount; i++) {
+    for (ssize_t i = 0; i < std::min<int>(maxcount, valuesize - ofs); i++) {
        if (i > 0) {
            strcat (buffer, ", ");
        }