From: Lars Schneider <larsxschneider@xxxxxxxxx> A P4 repository can get into a state where it contains a file with type UTF-16 that does not contain a valid UTF-16 BOM. If git-p4 attempts to retrieve the file then the process crashes with a "Translation of file content failed" error. Signed-off-by: Lars Schneider <larsxschneider@xxxxxxxxx> --- t/t9824-git-p4-handle-utf16-without-bom.sh | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100755 t/t9824-git-p4-handle-utf16-without-bom.sh diff --git a/t/t9824-git-p4-handle-utf16-without-bom.sh b/t/t9824-git-p4-handle-utf16-without-bom.sh new file mode 100755 index 0000000..fa8043b --- /dev/null +++ b/t/t9824-git-p4-handle-utf16-without-bom.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +test_description='git p4 handle UTF-16 without BOM' + +. ./lib-git-p4.sh + +UTF16="\\x97\\x0\\x97\\x0" + +test_expect_success 'start p4d' ' + start_p4d +' + +test_expect_success 'init depot with UTF-16 encoded file and artificially remove BOM' ' + ( + cd "$cli" && + echo "file1 -text" > .gitattributes && + perl -e "printf \"$UTF16\"" >file1 && + p4 add -t utf16 file1 && + + p4 add .gitattributes && + p4 submit -d "file1" + ) && + + ( + cd "db" && + p4d -jc && + # P4D automatically adds a BOM. Remove it here to make the file invalid. + perl -i -ne "print unless eof" depot/file1,v && + perl -e "printf \"@$UTF16@\"" >> depot/file1,v && + p4d -jrF checkpoint.1 + ) +' + +test_expect_success 'clone depot with invalid UTF-16 file' ' + git p4 clone --dest="$git" --verbose //depot && + ( + cd "$git" && + perl -e "printf \"$UTF16\"" > expect && + test_cmp_bin expect file1 + ) +' + +test_expect_success 'kill p4d' ' + kill_p4d +' + +test_done -- 2.5.1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html