parser: sensible psd exporters don't add an extra null terminator

Inochi2D · Jul 1, 2022 · f12e0ad · f12e0ad
1 parent f409673
commit f12e0ad
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/source/psd/parser.d b/source/psd/parser.d
@@ -734,7 +734,10 @@ LayerMaskSection* parseLayer(ref File file, ref PSD psd, ulong sectionOffset, ui
 
                     // If there's a unicode name we may as well use that here.
                     import std.utf : toUTF8;
-                    layer.name = utf16Name.toUTF8[0..$-1]; // strip null character as well
+                    layer.name = utf16Name.toUTF8;
+
+                    // Some PSD exporters throw an extra null in there for good measure, yeet it.
+                    if (layer.name[$-1] == '\0') layer.name.length--;
 
                     // skip possible padding bytes
                     file.skip(length - 4u - characterCountWithoutNull * ushort.sizeof);