From 221515e66363ecad855adf82dd40c1a4758d6d37 Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Tue, 6 Mar 2018 00:22:02 +0100 Subject: [PATCH] Load_PNG() : read Comment tEXt in addition to Title --- src/fileformats.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/fileformats.c b/src/fileformats.c index 64dbcf45..704f349c 100644 --- a/src/fileformats.c +++ b/src/fileformats.c @@ -6091,10 +6091,17 @@ static void Load_PNG_Sub(T_IO_Context * context, FILE * file) { while (num_text--) { - if (!strcmp(text_ptr[num_text].key,"Title")) + int size = COMMENT_SIZE; + if (text_ptr[num_text].text_length > 0 && text_ptr[num_text].text_length < COMMENT_SIZE) + size = text_ptr[num_text].text_length; + if (strcmp(text_ptr[num_text].key,"Title") == 0) + { + strncpy(context->Comment, text_ptr[num_text].text, size); + context->Comment[size]='\0'; + break; // Skip all others tEXt chunks + } + else if(strcmp(text_ptr[num_text].key, "Comment") == 0) { - int size; - size = Min(text_ptr[num_text].text_length, COMMENT_SIZE); strncpy(context->Comment, text_ptr[num_text].text, size); context->Comment[size]='\0'; break; // Skip all others tEXt chunks