Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 9a058fb766
Branches Tags
electron
/
patches
/
node
/
win-fix-uv_spawn-ENOMEM-on-empty-env.patch

win-fix-uv_spawn-ENOMEM-on-empty-env.patch 3.5 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Ben Noordhuis <[email protected]>
    3. 

  3. Date: Fri, 9 Aug 2019 13:34:20 +0200
    4. 

  4. Subject: win: fix uv_spawn() ENOMEM on empty env
    5. 

  5. 

  6. Commit ba780231 ("unix,win: handle zero-sized allocations uniformly")
    7. 

  7. makes `uv__malloc()` return NULL when `size == 0`.
    8. 

  8. 

  9. That's exactly the size that is passed to it when uv_spawn() tries to
    10. 

  10. spawn a process with an empty environment so handle that edge case.
    11. 

  11. 

  12. Fixes: https://github.com/nodejs/node/issues/29008
    13. 

  13. PR-URL: https://github.com/libuv/libuv/pull/2408
    14. 

  14. Reviewed-By: Anna Henningsen <[email protected]>
    15. 

  15. Reviewed-By: Colin Ihrig <[email protected]>
    16. 

  16. Reviewed-By: Jameson Nash <[email protected]>
    17. 

  17. Reviewed-By: Bartosz Sosnowski <[email protected]>
    18. 

  18. 

  19. diff --git a/deps/uv/src/win/process.c b/deps/uv/src/win/process.c
    20. 

  20. index fa1a76a2e6626e15bdd0681626fc82c9ca6907fe..e1010d1248a95a3927d6ed1a1affbb545c1d7201 100644
    21. 

  21. --- a/deps/uv/src/win/process.c
    22. 

  22. +++ b/deps/uv/src/win/process.c
    23. 

  23. @@ -714,7 +714,7 @@ int make_program_env(char* env_block[], WCHAR** dst_ptr) {
    24. 

  24.  
    25. 

  25.    /* second pass: copy to UTF-16 environment block */
    26. 

  26.    dst_copy = (WCHAR*)uv__malloc(env_len * sizeof(WCHAR));
    27. 

  27. -  if (!dst_copy) {
    28. 

  28. +  if (dst_copy == NULL && env_len > 0) {
    29. 

  29.      return ERROR_OUTOFMEMORY;
    30. 

  30.    }
    31. 

  31.    env_copy = alloca(env_block_count * sizeof(WCHAR*));
    32. 

  32. @@ -739,7 +739,7 @@ int make_program_env(char* env_block[], WCHAR** dst_ptr) {
    33. 

  33.      }
    34. 

  34.    }
    35. 

  35.    *ptr_copy = NULL;
    36. 

  36. -  assert(env_len == (size_t) (ptr - dst_copy));
    37. 

  37. +  assert(env_len == 0 || env_len == (size_t) (ptr - dst_copy));
    38. 

  38.  
    39. 

  39.    /* sort our (UTF-16) copy */
    40. 

  40.    qsort(env_copy, env_block_count-1, sizeof(wchar_t*), qsort_wcscmp);
    41. 

  41. diff --git a/deps/uv/test/test-list.h b/deps/uv/test/test-list.h
    42. 

  42. index 29e9cbf85df3f07dd3a017ffca1cea0b56e76b89..10ec86869008c2cd15848e71476bd18fb2af3da1 100644
    43. 

  43. --- a/deps/uv/test/test-list.h
    44. 

  44. +++ b/deps/uv/test/test-list.h
    45. 

  45. @@ -263,6 +263,7 @@ TEST_DECLARE   (spawn_fails)
    46. 

  46.  #ifndef _WIN32
    47. 

  47.  TEST_DECLARE   (spawn_fails_check_for_waitpid_cleanup)
    48. 

  48.  #endif
    49. 

  49. +TEST_DECLARE   (spawn_empty_env)
    50. 

  50.  TEST_DECLARE   (spawn_exit_code)
    51. 

  51.  TEST_DECLARE   (spawn_stdout)
    52. 

  52.  TEST_DECLARE   (spawn_stdin)
    53. 

  53. @@ -819,6 +820,7 @@ TASK_LIST_START
    54. 

  54.  #ifndef _WIN32
    55. 

  55.    TEST_ENTRY  (spawn_fails_check_for_waitpid_cleanup)
    56. 

  56.  #endif
    57. 

  57. +  TEST_ENTRY  (spawn_empty_env)
    58. 

  58.    TEST_ENTRY  (spawn_exit_code)
    59. 

  59.    TEST_ENTRY  (spawn_stdout)
    60. 

  60.    TEST_ENTRY  (spawn_stdin)
    61. 

  61. diff --git a/deps/uv/test/test-spawn.c b/deps/uv/test/test-spawn.c
    62. 

  62. index fea1165d89e08e9e56257cded55048b09c27d1d0..fec610bfdef97eff778c28158c2360ef02cb08e5 100644
    63. 

  63. --- a/deps/uv/test/test-spawn.c
    64. 

  64. +++ b/deps/uv/test/test-spawn.c
    65. 

  65. @@ -232,6 +232,34 @@ TEST_IMPL(spawn_fails_check_for_waitpid_cleanup) {
    66. 

  66.  #endif
    67. 

  67.  
    68. 

  68.  
    69. 

  69. +TEST_IMPL(spawn_empty_env) {
    70. 

  70. +  char* env[1];
    71. 

  71. +
    72. 

  72. +  /* The autotools dynamic library build requires the presence of
    73. 

  73. +   * DYLD_LIBARY_PATH (macOS) or LD_LIBRARY_PATH (other Unices)
    74. 

  74. +   * in the environment, but of course that doesn't work with
    75. 

  75. +   * the empty environment that we're testing here.
    76. 

  76. +   */
    77. 

  77. +  if (NULL != getenv("DYLD_LIBARY_PATH") ||
    78. 

  78. +      NULL != getenv("LD_LIBRARY_PATH")) {
    79. 

  79. +    RETURN_SKIP("doesn't work with DYLD_LIBRARY_PATH/LD_LIBRARY_PATH");
    80. 

  80. +  }
    81. 

  81. +
    82. 

  82. +  init_process_options("spawn_helper1", exit_cb);
    83. 

  83. +  options.env = env;
    84. 

  84. +  env[0] = NULL;
    85. 

  85. +
    86. 

  86. +  ASSERT(0 == uv_spawn(uv_default_loop(), &process, &options));
    87. 

  87. +  ASSERT(0 == uv_run(uv_default_loop(), UV_RUN_DEFAULT));
    88. 

  88. +
    89. 

  89. +  ASSERT(exit_cb_called == 1);
    90. 

  90. +  ASSERT(close_cb_called == 1);
    91. 

  91. +
    92. 

  92. +  MAKE_VALGRIND_HAPPY();
    93. 

  93. +  return 0;
    94. 

  94. +}
    95. 

  95. +
    96. 

  96. +
    97. 

  97.  TEST_IMPL(spawn_exit_code) {
    98. 

  98.    int r;
    99. 

  99.  
    100.