Bug 229841 - [JSC] Fix WebKitAdditions directory traversal in offlineasm
Summary: [JSC] Fix WebKitAdditions directory traversal in offlineasm
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Yusuke Suzuki
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2021-09-02 16:45 PDT by Yusuke Suzuki
Modified: 2021-09-02 19:14 PDT (History)
7 users (show)

See Also:

Attachments
Patch (15.30 KB, patch)
2021-09-02 16:47 PDT, Yusuke Suzuki 		no flags Details | Formatted Diff | Diff
Patch (15.98 KB, patch)
2021-09-02 17:32 PDT, Yusuke Suzuki 		mark.lam: review+
Details | Formatted Diff | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Yusuke Suzuki 2021-09-02 16:45:17 PDT 
[JSC] Fix WebKitAddition directory traversal in offlineasm
Comment 1 Yusuke Suzuki 2021-09-02 16:47:45 PDT 
Created attachment 437219 [details]
Patch
Comment 2 Mark Lam 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.
Comment 3 Yusuke Suzuki 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.
Comment 4 Mark Lam 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)`.
Comment 5 Yusuke Suzuki 2021-09-02 17:32:35 PDT 
Created attachment 437225 [details]
Patch
Comment 6 Mark Lam 2021-09-02 17:34:23 PDT 
Comment on attachment 437225 [details]
Patch

r=me
Comment 7 Radar WebKit Bug Importer 2021-09-02 18:07:13 PDT 
<rdar://problem/82701787>
Comment 8 Yusuke Suzuki 2021-09-02 19:13:45 PDT 
OK, compilation finished.
Comment 9 Yusuke Suzuki 2021-09-02 19:14:56 PDT 
Committed r281972 (241279@main): <https://commits.webkit.org/241279@main>