RESOLVED FIXED 229841
[JSC] Fix WebKitAdditions directory traversal in offlineasm 
https://bugs.webkit.org/show_bug.cgi?id=229841
Summary [JSC] Fix WebKitAdditions directory traversal in offlineasm
Yusuke Suzuki
Reported 2021-09-02 16:45:17 PDT
[JSC] Fix WebKitAddition directory traversal in offlineasm
Attachments
Patch (15.30 KB, patch)
2021-09-02 16:47 PDT, Yusuke Suzuki 		no flags
DetailsFormatted DiffDiff
Patch (15.98 KB, patch)
2021-09-02 17:32 PDT, Yusuke Suzuki 		mark.lam: review+
DetailsFormatted DiffDiff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.
Yusuke Suzuki
Comment 1 2021-09-02 16:47:45 PDT
Created attachment 437219 [details] Patch
Mark Lam
Comment 2 2021-09-02 17:00:56 PDT
Comment on attachment 437219 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437219&action=review r=me > Source/JavaScriptCore/offlineasm/asm.rb:338 > + opts.banner = "Usage: asm.rb asmFile offsetsFile outputFileName [--assembler=<ASM> --use-deployment-location]" Should this be "[--assembler=<ASM>] [--use-deployment-location]" instead since the 2 options are independent? > Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb:52 > + # This option is currently only used to specify the masm assembler This comment is not relevant. I think it's just copied from above. Please remove. > Source/JavaScriptCore/offlineasm/generate_settings_extractor.rb:49 > + # This option is currently only used to specify the masm assembler Ditto. Please remove.
Yusuke Suzuki
Comment 3 2021-09-02 17:16:54 PDT
Comment on attachment 437219 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437219&action=review Thanks! >> Source/JavaScriptCore/offlineasm/asm.rb:338 >> + opts.banner = "Usage: asm.rb asmFile offsetsFile outputFileName [--assembler=<ASM> --use-deployment-location]" > > Should this be "[--assembler=<ASM>] [--use-deployment-location]" instead since the 2 options are independent? Changed. >> Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb:52 >> + # This option is currently only used to specify the masm assembler > > This comment is not relevant. I think it's just copied from above. Please remove. Removed. >> Source/JavaScriptCore/offlineasm/generate_settings_extractor.rb:49 >> + # This option is currently only used to specify the masm assembler > > Ditto. Please remove. Removed.
Mark Lam
Comment 4 2021-09-02 17:18:55 PDT
Comment on attachment 437219 [details] Patch You missed one spot in parser.rb: search for "/usr/local/include/WebKitAdditions/" and you'll see a seconds place the path is chosen in `def parseIncludes(final, comment)`.
Yusuke Suzuki
Comment 5 2021-09-02 17:32:35 PDT
Created attachment 437225 [details] Patch
Mark Lam
Comment 6 2021-09-02 17:34:23 PDT
Comment on attachment 437225 [details] Patch r=me
Radar WebKit Bug Importer
Comment 7 2021-09-02 18:07:13 PDT
<rdar://problem/82701787>
Yusuke Suzuki
Comment 8 2021-09-02 19:13:45 PDT
OK, compilation finished.
Yusuke Suzuki
Comment 9 2021-09-02 19:14:56 PDT
Committed r281972 (241279@main): <https://commits.webkit.org/241279@main>
Note You need to log in before you can comment on or make changes to this bug.