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
/
fix_uv_fs_mkdir_for_invalid_names.patch

fix_uv_fs_mkdir_for_invalid_names.patch 2.6 KB
History Raw

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

  2. From: Bartosz Sosnowski <[email protected]>
    3. 

  3. Date: Thu, 11 Jul 2019 12:45:38 +0200
    4. 

  4. Subject: win, fs: mkdir return UV_EINVAL for invalid names
    5. 

  5. MIME-Version: 1.0
    6. 

  6. Content-Type: text/plain; charset=UTF-8
    7. 

  7. Content-Transfer-Encoding: 8bit
    8. 

  8. 

  9. Makes uv_fs_mkdir return UV_EINVAL for invalid filenames instead of
    10. 

  10. UV_ENOENT.
    11. 

  11. 

  12. Ref: https://github.com/nodejs/node/issues/28599
    13. 

  13. 

  14. PR-URL: https://github.com/libuv/libuv/pull/2375
    15. 

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

  16. Reviewed-By: Saúl Ibarra Corretgé <[email protected]>
    17. 

  17. Reviewed-By: Colin Ihrig <[email protected]>
    18. 

  18. 

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

  20. index 9e2f084c8d0e9c0cc60cf5010bdc396bf5eb22e5..088191320cc671a8bc6ae45f07b3b05f95b01b08 100644
    21. 

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

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

  23. @@ -850,8 +850,13 @@ void fs__unlink(uv_fs_t* req) {
    24. 

  24.  
    25. 

  25.  void fs__mkdir(uv_fs_t* req) {
    26. 

  26.    /* TODO: use req->mode. */
    27. 

  27. -  int result = _wmkdir(req->file.pathw);
    28. 

  28. -  SET_REQ_RESULT(req, result);
    29. 

  29. +  req->result = _wmkdir(req->file.pathw);
    30. 

  30. +  if (req->result == -1) {
    31. 

  31. +    req->sys_errno_ = _doserrno;
    32. 

  32. +    req->result = req->sys_errno_ == ERROR_INVALID_NAME
    33. 

  33. +                ? UV_EINVAL
    34. 

  34. +                : uv_translate_sys_error(req->sys_errno_);
    35. 

  35. +  }
    36. 

  36.  }
    37. 

  37.  
    38. 

  38.  
    39. 

  39. diff --git a/deps/uv/test/test-fs.c b/deps/uv/test/test-fs.c
    40. 

  40. index c3153c717b7cd391f71b6184d62e4ee55841591b..fb64ae6b037be591a30a63d9e5450dcfd48e3bdc 100644
    41. 

  41. --- a/deps/uv/test/test-fs.c
    42. 

  42. +++ b/deps/uv/test/test-fs.c
    43. 

  43. @@ -3815,4 +3815,16 @@ TEST_IMPL(fs_fchmod_archive_readonly) {
    44. 

  44.  
    45. 

  45.      return 0;
    46. 

  46.  }
    47. 

  47. +
    48. 

  48. +TEST_IMPL(fs_invalid_mkdir_name) {
    49. 

  49. +  uv_loop_t* loop;
    50. 

  50. +  uv_fs_t req;
    51. 

  51. +  int r;
    52. 

  52. +
    53. 

  53. +  loop = uv_default_loop();
    54. 

  54. +  r = uv_fs_mkdir(loop, &req, "invalid>", 0, NULL);
    55. 

  55. +  ASSERT(r == UV_EINVAL);
    56. 

  56. +
    57. 

  57. +  return 0;
    58. 

  58. +}
    59. 

  59.  #endif
    60. 

  60. diff --git a/deps/uv/test/test-list.h b/deps/uv/test/test-list.h
    61. 

  61. index 8886b07c8a74736208d5614257f832f59d79633a..29e9cbf85df3f07dd3a017ffca1cea0b56e76b89 100644
    62. 

  62. --- a/deps/uv/test/test-list.h
    63. 

  63. +++ b/deps/uv/test/test-list.h
    64. 

  64. @@ -372,6 +372,7 @@ TEST_DECLARE   (fs_exclusive_sharing_mode)
    65. 

  65.  TEST_DECLARE   (fs_file_flag_no_buffering)
    66. 

  66.  TEST_DECLARE   (fs_open_readonly_acl)
    67. 

  67.  TEST_DECLARE   (fs_fchmod_archive_readonly)
    68. 

  68. +TEST_DECLARE   (fs_invalid_mkdir_name)
    69. 

  69.  #endif
    70. 

  70.  TEST_DECLARE   (strscpy)
    71. 

  71.  TEST_DECLARE   (threadpool_queue_work_simple)
    72. 

  72. @@ -957,6 +958,7 @@ TASK_LIST_START
    73. 

  73.    TEST_ENTRY  (fs_file_flag_no_buffering)
    74. 

  74.    TEST_ENTRY  (fs_open_readonly_acl)
    75. 

  75.    TEST_ENTRY  (fs_fchmod_archive_readonly)
    76. 

  76. +  TEST_ENTRY  (fs_invalid_mkdir_name)
    77. 

  77.  #endif
    78. 

  78.    TEST_ENTRY  (get_osfhandle_valid_handle)
    79. 

  79.    TEST_ENTRY  (open_osfhandle_valid_handle)
    80.