X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fpathlist.c;h=e14c1877aaa549f807ebbd781682a0d9e20f16a3;hb=c94e4a479c2b77cc9046e7820c539f749fc15d6e;hp=ada1f302f119b1238a3d6489a1f84f140af43f4c;hpb=5343a64b3eb1eef2e9923d3c84b7e27a72524693;p=wimlib diff --git a/src/pathlist.c b/src/pathlist.c index ada1f302..e14c1877 100644 --- a/src/pathlist.c +++ b/src/pathlist.c @@ -90,6 +90,7 @@ read_utf8_file_contents(const tchar *path, tchar **buf_ret, size_t *buflen_ret) int ret; char *buf_utf8; size_t bufsize_utf8; + size_t offset_utf8; tchar *buf_tstr; size_t bufsize_tstr; @@ -97,7 +98,15 @@ read_utf8_file_contents(const tchar *path, tchar **buf_ret, size_t *buflen_ret) if (ret) return ret; - ret = utf8_to_tstr(buf_utf8, bufsize_utf8, &buf_tstr, &bufsize_tstr); + /* Ignore UTF-8 BOM. */ + if (bufsize_utf8 >= 3 && (u8)buf_utf8[0] == 0xef && + (u8)buf_utf8[1] == 0xbb && (u8)buf_utf8[2] == 0xbf) + offset_utf8 = 3; + else + offset_utf8 = 0; + + ret = utf8_to_tstr(buf_utf8 + offset_utf8, bufsize_utf8 - offset_utf8, + &buf_tstr, &bufsize_tstr); FREE(buf_utf8); if (ret) return ret;