Commit 27cc90f
build: fix C string encoding for PRODUCT_DIR_ABS
Since the `PRODUCT_DIR_ABS` gyp variable is meant to be used
in a C string in the OpenSSL config, provide a version of it
that actually provides it in a way that is always usable as a
C string. Otherwise, unescaped characters in the path can mess
with the string definitions; for example, building in paths
on Windows whose directories start with valid or invalid escape
sequences (e.g.: `C:\...\x61foobar\...` or `C:\...\456789\...`)
can result in failing builds or incorrect paths provided to
OpenSSL.
PR-URL: #56111
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 98ea499 commit 27cc90f
1 file changed
Lines changed: 3 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,19 +5,13 @@ | |||
| 5 | 5 | 'nasm_version%': '0.0', | |
| 6 | 6 | 'openssl-cli': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)openssl-cli<(EXECUTABLE_SUFFIX)', | |
| 7 | 7 | 'conditions': [ | |
| 8 | - ['OS == "win"', { | ||
| 9 | - 'obj_dir_abs': '<(PRODUCT_DIR_ABS)/obj', | ||
| 10 | - }], | ||
| 11 | 8 | ['GENERATOR == "ninja"', { | |
| 12 | - 'obj_dir_abs': '<(PRODUCT_DIR_ABS)/obj', | ||
| 13 | - 'modules_dir': '<(PRODUCT_DIR_ABS)/obj/lib/openssl-modules', | ||
| 9 | + 'modules_dir': '<(PRODUCT_DIR_ABS_CSTR)/obj/lib/openssl-modules', | ||
| 14 | 10 | }, { | |
| 15 | - 'obj_dir_abs%': '<(PRODUCT_DIR_ABS)/obj.target', | ||
| 16 | - 'modules_dir': '<(PRODUCT_DIR_ABS)/obj.target/deps/openssl/lib/openssl-modules', | ||
| 11 | + 'modules_dir': '<(PRODUCT_DIR_ABS_CSTR)/obj.target/deps/openssl/lib/openssl-modules', | ||
| 17 | 12 | }], | |
| 18 | 13 | ['OS=="mac"', { | |
| 19 | - 'obj_dir_abs%': '<(PRODUCT_DIR_ABS)/obj.target', | ||
| 20 | - 'modules_dir': '<(PRODUCT_DIR_ABS)/obj.target/deps/openssl/lib/openssl-modules', | ||
| 14 | + 'modules_dir': '<(PRODUCT_DIR_ABS_CSTR)/obj.target/deps/openssl/lib/openssl-modules', | ||
| 21 | 15 | }], | |
| 22 | 16 | ], | |
| 23 | 17 | }, | |
0 commit comments