Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ICE when reading non-UTF-8 input from stdin #47895

Merged
merged 3 commits into from
Jan 31, 2018
Merged

Fix ICE when reading non-UTF-8 input from stdin #47895

merged 3 commits into from
Jan 31, 2018

Conversation

varkor
Copy link
Member

@varkor varkor commented Jan 31, 2018

Fixes #22387.

@rust-highfive
Copy link
Collaborator

r? @cramertj

(rust_highfive has picked a reviewer for you, use r? to override)

@cramertj
Copy link
Member

Travis failure looks legit:

[01:07:49] failures:
[01:07:49] thread 'main' panicked at 'Some tests failed', tools/compiletest/src/main.rs:476:22
[01:07:49] 
[01:07:49] ---- [run-make] run-make/stdin-non-utf8 stdout ----
[01:07:49] 	
[01:07:49] error: make failed
[01:07:49] status: exit code: 2
[01:07:49] command: "make"
[01:07:49] stdout:
[01:07:49] ------------------------------------------
[01:07:49] make[1]: Entering directory '/checkout/src/test/run-make/stdin-non-utf8'
[01:07:49] echo '\xD2' | LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/stdin-non-utf8.stage2-x86_64-unknown-linux-gnu:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib:" '/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/stdin-non-utf8.stage2-x86_64-unknown-linux-gnu -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/stdin-non-utf8.stage2-x86_64-unknown-linux-gnu  - 2>&1 \
[01:07:49] 	| "/checkout/src/etc/cat-and-grep.sh" "error: couldn't read from stdin, as it did not contain valid UTF-8"
[01:07:49] [[[ begin stdout ]]]
[01:07:49] error: unknown start of token: \\
[01:07:49]  --> <anon>:1:1
[01:07:49]   |
[01:07:49] 1 | \xD2
[01:07:49]   | ^
[01:07:49] 
[01:07:49] 
[01:07:49] [[[ end stdout ]]]
[01:07:49] Error: cannot match: error: couldn't read from stdin, as it did not contain valid UTF-8
[01:07:49] Makefile:4: recipe for target 'all' failed
[01:07:49] make[1]: Leaving directory '/checkout/src/test/run-make/stdin-non-utf8'
[01:07:49] 
[01:07:49] ------------------------------------------
[01:07:49] stderr:
[01:07:49] ------------------------------------------
[01:07:49] make[1]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.
[01:07:49] make[1]: *** [all] Error 1
[01:07:49] 
[01:07:49] ------------------------------------------
[01:07:49] 
[01:07:49] thread '[run-make] run-make/stdin-non-utf8' panicked at 'explicit panic', tools/compiletest/src/runtest.rs:2883:9
[01:07:49] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:07:49] 
[01:07:49] 
[01:07:49] failures:
[01:07:49]     [run-make] run-make/stdin-non-utf8
[01:07:49] 
[01:07:49] test result: FAILED. 173 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
[01:07:49] 
[01:07:49] 
[01:07:49] 
[01:07:49] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--rustdoc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "--src-base" "/checkout/src/test/run-make" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "run-make" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-3.9/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zmiri -Zunstable-options " "--target-rustcflags" "-Crpath -O -Zmiri -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "3.9.1\n" "--system-llvm" "--cc" "cc" "--cxx" "c++" "--cflags" "-ffunction-sections -fdata-sections -fPIC -m64" "--llvm-components" "aarch64 aarch64asmparser aarch64asmprinter aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils all all-targets amdgpu amdgpuasmparser amdgpuasmprinter amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgpuutils analysis arm armasmparser armasmprinter armcodegen armdesc armdisassembler arminfo asmparser asmprinter bitreader bitwriter bpf bpfasmprinter bpfcodegen bpfdesc bpfinfo codegen core coverage debuginfocodeview debuginfodwarf debuginfopdb engine executionengine globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interpreter ipo irreader libdriver lineeditor linker lto mc mcdisassembler mcjit mcparser mips mipsasmparser mipsasmprinter mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmprinter msp430codegen msp430desc msp430info native nativecodegen nvptx nvptxasmprinter nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit passes powerpc powerpcasmparser powerpcasmprinter powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata runtimedyld scalaropts selectiondag sparc sparcasmparser sparcasmprinter sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzasmprinter systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target transformutils vectorize x86 x86asmparser x86asmprinter x86codegen x86desc x86disassembler x86info x86utils xcore xcoreasmprinter xcorecodegen xcoredesc xcoredisassembler xcoreinfo" "--llvm-cxxflags" "-I/usr/lib/llvm-3.9/include -std=c++0x -gsplit-dwarf -Wl,-fuse-ld=gold -fPIC -fvisibility-inlines-hidden -Wall -W -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -pedantic -Wno-long-long -Wno-maybe-uninitialized -Wdelete-non-virtual-dtor -Wno-comment -Werror=date-time -std=c++11 -ffunction-sections -fdata-sections -O2 -g -DNDEBUG  -fno-exceptions -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" "--ar" "ar" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:07:49] expected success, got: exit code: 101
[01:07:49] 
[01:07:49] 
[01:07:49] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:07:49] Build completed unsuccessfully in 0:29:29
[01:07:49] Makefile:52: recipe for target 'check' failed
[01:07:49] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.

@kennytm kennytm added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 31, 2018
@varkor
Copy link
Member Author

varkor commented Jan 31, 2018 •
edited
Loading

This is because the special character is not escaped for echo. It may be too system-dependent to use echo for this (e.g. the test worked even without the -e flag on my machine): if it fails again, I'll output the character some other way.

Edit: Now using a separate file to hopefully avoid platform differences.

@estebank
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 31, 2018

📌 Commit a43d7eb has been approved by estebank

@kennytm kennytm mentioned this pull request Jan 31, 2018
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Jan 31, 2018
@kennytm
Rollup merge of rust-lang#47895 - varkor:non-utf-stdin, r=estebank
86eb725 
Fix ICE when reading non-UTF-8 input from stdin

Fixes rust-lang#22387.
bors added a commit that referenced this pull request Jan 31, 2018
@bors
Auto merge of #47900 - kennytm:rollup, r=kennytm
8ccab7e 
Rollup of 16 pull requests

- Successful merges: #47838, #47840, #47844, #47874, #47875, #47876, #47884, #47886, #47889, #47890, #47891, #47795, #47677, #47893, #47895, #47552
- Failed merges:
@bors bors merged commit a43d7eb into rust-lang:master Jan 31, 2018
@varkor varkor deleted the non-utf-stdin branch February 1, 2018 00:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cramertj cramertj

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@varkor @rust-highfive @cramertj @estebank @bors @kennytm