diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index b0ffd7bf61..078c29a541 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -215,7 +215,9 @@ static char *doubles2str(double *dp, int count, const char *sep)
     ap0   = ap;
     ap[0] = '\0';
     for (i = 0; i < count; i++) {
-        int l = snprintf(ap, component_len, "%f%s", dp[i], sep);
+        unsigned l = snprintf(ap, component_len, "%f%s", dp[i], sep);
+        if(l >= component_len)
+            return NULL;
         ap += l;
     }
     ap0[strlen(ap0) - strlen(sep)] = '\0';