From 383fcb84d892e5169c134e282878ee2c51e4265f Mon Sep 17 00:00:00 2001 From: Nathan Sashihara <21227491+n8sh@users.noreply.github.com> Date: Tue, 1 Jan 2019 05:13:09 -0500 Subject: [PATCH] Fix byte order mark stripping (#740) Fix byte order mark stripping merged-on-behalf-of: BBasile --- src/dscanner/utils.d | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/dscanner/utils.d b/src/dscanner/utils.d index 11f2305..92d25e5 100644 --- a/src/dscanner/utils.d +++ b/src/dscanner/utils.d @@ -7,7 +7,7 @@ import std.encoding : BOM, BOMSeq, EncodingException, getBOM; import std.format : format; import std.file : exists, read; -private void processBOM(ubyte[] sourceCode, string fname) +private void processBOM(ref ubyte[] sourceCode, string fname) { enum spec = "D-Scanner does not support %s-encoded files (%s)"; const BOMSeq bs = sourceCode.getBOM; @@ -21,6 +21,13 @@ private void processBOM(ubyte[] sourceCode, string fname) sourceCode = sourceCode[bs.sequence.length .. $]; } +unittest +{ + ubyte[] data = [0xEF, 0xBB, 0xBF, 'h', 'i', '!']; + data.processBOM("unittest data"); + assert(data[] == cast(ubyte[]) "hi!"); +} + unittest { import std.exception : assertThrown, assertNotThrown; @@ -52,8 +59,9 @@ ubyte[] readStdin() break; sourceCode.put(b); } - sourceCode.data.processBOM("stdin"); - return sourceCode.data; + auto data = sourceCode.data; + data.processBOM("stdin"); + return data; } ubyte[] readFile(string fileName)