--- parser3/src/classes/image.C	2025/05/26 00:52:15	1.196
+++ parser3/src/classes/image.C	2026/04/25 13:38:46	1.199
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b image parser class.
 
-	Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com)
 	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
@@ -26,7 +26,7 @@
 #include "pa_table.h"
 #include "pa_charsets.h"
 
-volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.196 2025/05/26 00:52:15 moko Exp $";
+volatile const char * IDENT_IMAGE_C="$Id: image.C,v 1.199 2026/04/25 13:38:46 moko Exp $";
 
 // defines
 
@@ -443,7 +443,7 @@ static Value* parse_IFD_entry_formatted_
 			catch(...) { /*ignore bad date times*/ }
 		}
 
-		return new VString(*new String(cstr, String::L_TAINTED));
+		return new VString(cstr);
 	}
 
 	if(components_count==1)
@@ -994,31 +994,22 @@ static void _measure(Request& r, MethodP
 
 	if(params.count()>1)
 		if(HashStringValue* options=params.as_hash(1, "methods options")) {
-			int valid_options=0;
 			for(HashStringValue::Iterator i(*options); i; i.next() ){
 				String::Body key=i.key();
 				Value* value=i.value();
 				if(key == "exif") {
 					if(r.process(*value).as_bool())
 						info.exif=&exif;
-					valid_options++;
-				}
-				if(key == "xmp") {
+				} else if(key == "xmp") {
 					if(r.process(*value).as_bool())
 						info.xmp=&xmp;
-					valid_options++;
-				}
-				if(key == "xmp-charset") {
+				} else if(key == "xmp-charset") {
 					info.xmp_charset=&pa_charsets.get(value->as_string());
-					valid_options++;
-				}
-				if(key == "video") {
+				} else if(key == "video") {
 					info.video=r.process(*value).as_bool();
-					valid_options++;
-				}
+				} else
+					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 			}
-			if(valid_options!=options->count())
-				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 		}
 
 	const String* file_name;