Commit b2b9d11
committed
src: fix fs.write() externalized string handling
* Respect `encoding` argument when the string is externalized.
* Copy the string when the write request can outlive the externalized
string.
This commit removes `StringBytes::GetExternalParts()` because it is
fundamentally broken.
Fixes: #18146
PR-URL: #18216
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>1 parent 0b1841d commit b2b9d11
File tree
4 files changed
+105
-108
lines changed- src
- test/parallel
4 files changed
+105
-108
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| 42 | + | |
42 | 43 | | |
43 | 44 | | |
44 | 45 | | |
| |||
1019 | 1020 | | |
1020 | 1021 | | |
1021 | 1022 | | |
| 1023 | + | |
1022 | 1024 | | |
1023 | | - | |
| 1025 | + | |
1024 | 1026 | | |
1025 | 1027 | | |
1026 | | - | |
1027 | 1028 | | |
| 1029 | + | |
| 1030 | + | |
| 1031 | + | |
| 1032 | + | |
| 1033 | + | |
| 1034 | + | |
| 1035 | + | |
| 1036 | + | |
| 1037 | + | |
| 1038 | + | |
| 1039 | + | |
| 1040 | + | |
| 1041 | + | |
| 1042 | + | |
| 1043 | + | |
| 1044 | + | |
| 1045 | + | |
| 1046 | + | |
| 1047 | + | |
| 1048 | + | |
| 1049 | + | |
| 1050 | + | |
| 1051 | + | |
1028 | 1052 | | |
1029 | | - | |
1030 | | - | |
1031 | | - | |
1032 | | - | |
1033 | | - | |
1034 | | - | |
| 1053 | + | |
| 1054 | + | |
1035 | 1055 | | |
| 1056 | + | |
| 1057 | + | |
1036 | 1058 | | |
1037 | 1059 | | |
1038 | 1060 | | |
1039 | 1061 | | |
1040 | | - | |
1041 | 1062 | | |
1042 | | - | |
| 1063 | + | |
1043 | 1064 | | |
1044 | | - | |
| 1065 | + | |
1045 | 1066 | | |
1046 | 1067 | | |
1047 | 1068 | | |
1048 | 1069 | | |
1049 | | - | |
1050 | | - | |
1051 | | - | |
1052 | | - | |
1053 | | - | |
1054 | | - | |
1055 | | - | |
1056 | 1070 | | |
1057 | 1071 | | |
1058 | 1072 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
| 31 | + | |
30 | 32 | | |
31 | 33 | | |
32 | 34 | | |
| |||
269 | 271 | | |
270 | 272 | | |
271 | 273 | | |
272 | | - | |
273 | | - | |
274 | | - | |
275 | | - | |
276 | | - | |
277 | | - | |
278 | | - | |
279 | | - | |
280 | | - | |
281 | | - | |
282 | | - | |
283 | | - | |
284 | | - | |
285 | | - | |
286 | | - | |
287 | | - | |
288 | | - | |
289 | | - | |
290 | | - | |
291 | | - | |
292 | | - | |
293 | | - | |
294 | | - | |
295 | | - | |
296 | | - | |
297 | | - | |
298 | | - | |
299 | | - | |
300 | | - | |
301 | | - | |
302 | | - | |
303 | | - | |
304 | | - | |
305 | 274 | | |
306 | 275 | | |
307 | 276 | | |
| |||
347 | 316 | | |
348 | 317 | | |
349 | 318 | | |
350 | | - | |
351 | | - | |
352 | | - | |
353 | | - | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
354 | 324 | | |
355 | 325 | | |
356 | 326 | | |
357 | 327 | | |
358 | | - | |
359 | | - | |
360 | | - | |
361 | 328 | | |
362 | 329 | | |
363 | 330 | | |
364 | 331 | | |
365 | 332 | | |
366 | 333 | | |
367 | 334 | | |
368 | | - | |
369 | | - | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
370 | 339 | | |
371 | 340 | | |
372 | 341 | | |
373 | 342 | | |
374 | | - | |
375 | | - | |
| 343 | + | |
376 | 344 | | |
377 | 345 | | |
378 | 346 | | |
| |||
383 | 351 | | |
384 | 352 | | |
385 | 353 | | |
386 | | - | |
387 | | - | |
388 | | - | |
389 | | - | |
390 | | - | |
391 | | - | |
392 | | - | |
393 | | - | |
| 354 | + | |
| 355 | + | |
394 | 356 | | |
395 | 357 | | |
396 | 358 | | |
| |||
403 | 365 | | |
404 | 366 | | |
405 | 367 | | |
406 | | - | |
407 | | - | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
408 | 371 | | |
409 | 372 | | |
410 | 373 | | |
411 | 374 | | |
412 | | - | |
413 | | - | |
414 | | - | |
| 375 | + | |
415 | 376 | | |
416 | 377 | | |
417 | 378 | | |
418 | | - | |
419 | | - | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
420 | 382 | | |
421 | 383 | | |
422 | 384 | | |
423 | 385 | | |
424 | | - | |
425 | | - | |
426 | | - | |
| 386 | + | |
427 | 387 | | |
428 | 388 | | |
429 | 389 | | |
| |||
500 | 460 | | |
501 | 461 | | |
502 | 462 | | |
503 | | - | |
504 | | - | |
505 | 463 | | |
506 | | - | |
| 464 | + | |
507 | 465 | | |
508 | 466 | | |
509 | | - | |
510 | | - | |
511 | | - | |
512 | | - | |
513 | 467 | | |
514 | 468 | | |
515 | 469 | | |
516 | 470 | | |
517 | 471 | | |
518 | | - | |
519 | | - | |
| 472 | + | |
520 | 473 | | |
521 | 474 | | |
522 | 475 | | |
523 | | - | |
524 | | - | |
| 476 | + | |
525 | 477 | | |
526 | 478 | | |
527 | | - | |
528 | | - | |
| 479 | + | |
529 | 480 | | |
530 | 481 | | |
531 | 482 | | |
532 | | - | |
533 | | - | |
| 483 | + | |
534 | 484 | | |
535 | 485 | | |
536 | 486 | | |
537 | | - | |
538 | | - | |
539 | | - | |
540 | | - | |
541 | | - | |
542 | | - | |
| 487 | + | |
543 | 488 | | |
544 | 489 | | |
545 | | - | |
| 490 | + | |
546 | 491 | | |
547 | 492 | | |
548 | 493 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
81 | 81 | | |
82 | 82 | | |
83 | 83 | | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | 84 | | |
91 | 85 | | |
92 | 86 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| |||
30 | 31 | | |
31 | 32 | | |
32 | 33 | | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
33 | 77 | | |
34 | 78 | | |
35 | 79 | | |
| |||
0 commit comments