@@ -1,7 +1,7 @@ /* - * Copyright (c) 2008-2022 Jonathan Schleifer + * Copyright (c) 2008-2024 Jonathan Schleifer * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in @@ -212,14 +212,16 @@ if ([name isEqual: @"charset"]) charset = value; } - @try { - ret = OFStringEncodingParseName(charset); - } @catch (OFInvalidArgumentException *e) { - ret = OFStringEncodingAutodetect; + ret = OFStringEncodingAutodetect; + if (charset != nil) { + @try { + ret = OFStringEncodingParseName(charset); + } @catch (OFInvalidArgumentException *e) { + } } return ret; }