Commit dca680e
committed
Fix #11000: getInstalledTZNames can't handle a trailing slash.
Normally, on most systems, PosixTimeZone.getInstalledTZNames uses
/usr/share/zoneinfo/ for the time zone database directory, but it can be
given a different directory, and it will use what TZDIR has been set to
if it's been set (since the function used as the default argument checks
TZDIR).
So, while the bug refers specifically to TZDIR, that's just one way that
the alternate time zone database directory can be passed to
getInstalledTZNames.
If getInstalledTZNames is given a directory name which does not end with
a slash, then the logic for stripping off the time zone database
directory name from the full paths to each time zone file leaves a slash
on the front of the time zone name, which then doesn't work correctly,
since it's not supposed to start with a slash.
So, this fixes it so that the time zone names don't end up with slashes
due to how many slashes the time zone database directory name does or
doesn't have.
I tested the subName argument as part of this in case it mattered and
was somewhat horrified to realize that it had not actually been tested
by any of the existing tests. So, I guess that I screwed up on that
count. Fortunately, it seems to work correctly.1 parent 789fd8d commit dca680e
1 file changed
Lines changed: 117 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2474 | 2474 | | |
2475 | 2475 | | |
2476 | 2476 | | |
| 2477 | + | |
| 2478 | + | |
| 2479 | + | |
| 2480 | + | |
2477 | 2481 | | |
2478 | 2482 | | |
2479 | 2483 | | |
| |||
2537 | 2541 | | |
2538 | 2542 | | |
2539 | 2543 | | |
| 2544 | + | |
| 2545 | + | |
| 2546 | + | |
| 2547 | + | |
| 2548 | + | |
| 2549 | + | |
| 2550 | + | |
| 2551 | + | |
| 2552 | + | |
| 2553 | + | |
| 2554 | + | |
| 2555 | + | |
| 2556 | + | |
| 2557 | + | |
| 2558 | + | |
| 2559 | + | |
| 2560 | + | |
| 2561 | + | |
| 2562 | + | |
| 2563 | + | |
| 2564 | + | |
| 2565 | + | |
| 2566 | + | |
| 2567 | + | |
| 2568 | + | |
| 2569 | + | |
| 2570 | + | |
| 2571 | + | |
| 2572 | + | |
| 2573 | + | |
| 2574 | + | |
| 2575 | + | |
| 2576 | + | |
| 2577 | + | |
| 2578 | + | |
| 2579 | + | |
| 2580 | + | |
| 2581 | + | |
| 2582 | + | |
| 2583 | + | |
| 2584 | + | |
| 2585 | + | |
| 2586 | + | |
| 2587 | + | |
| 2588 | + | |
| 2589 | + | |
| 2590 | + | |
| 2591 | + | |
| 2592 | + | |
| 2593 | + | |
| 2594 | + | |
| 2595 | + | |
| 2596 | + | |
| 2597 | + | |
| 2598 | + | |
| 2599 | + | |
| 2600 | + | |
| 2601 | + | |
| 2602 | + | |
| 2603 | + | |
| 2604 | + | |
| 2605 | + | |
| 2606 | + | |
| 2607 | + | |
| 2608 | + | |
| 2609 | + | |
| 2610 | + | |
| 2611 | + | |
| 2612 | + | |
| 2613 | + | |
| 2614 | + | |
| 2615 | + | |
| 2616 | + | |
| 2617 | + | |
| 2618 | + | |
| 2619 | + | |
| 2620 | + | |
| 2621 | + | |
| 2622 | + | |
| 2623 | + | |
| 2624 | + | |
| 2625 | + | |
| 2626 | + | |
| 2627 | + | |
| 2628 | + | |
| 2629 | + | |
| 2630 | + | |
| 2631 | + | |
| 2632 | + | |
| 2633 | + | |
| 2634 | + | |
| 2635 | + | |
| 2636 | + | |
| 2637 | + | |
| 2638 | + | |
| 2639 | + | |
| 2640 | + | |
| 2641 | + | |
| 2642 | + | |
| 2643 | + | |
| 2644 | + | |
| 2645 | + | |
| 2646 | + | |
| 2647 | + | |
| 2648 | + | |
| 2649 | + | |
| 2650 | + | |
| 2651 | + | |
| 2652 | + | |
| 2653 | + | |
| 2654 | + | |
| 2655 | + | |
| 2656 | + | |
2540 | 2657 | | |
2541 | 2658 | | |
2542 | 2659 | | |
| |||
0 commit comments