Artifact
81a06e537e61c2142ab2986e501c3d7fef76869187aec9946747684232d6ee59:
Attachment "clock-format-z-overflow.patch" to
ticket [e713c36677]
added by
bef
2026-11-05 16:17:29.
(unpublished)
0000: 2d 2d 2d 20 61 2f 67 65 6e 65 72 69 63 2f 74 63 --- a/generic/tc
0010: 6c 43 6c 6f 63 6b 46 6d 74 2e 63 0a 2b 2b 2b 20 lClockFmt.c.+++
0020: 62 2f 67 65 6e 65 72 69 63 2f 74 63 6c 43 6c 6f b/generic/tclClo
0030: 63 6b 46 6d 74 2e 63 0a 40 40 20 2d 32 39 32 31 ckFmt.c.@@ -2921
0040: 2c 32 33 20 2b 32 39 32 31 2c 32 37 20 40 40 0a ,23 +2921,27 @@.
0050: 20 20 20 20 20 54 43 4c 5f 55 4e 55 53 45 44 28 TCL_UNUSED(
0060: 69 6e 74 20 2a 29 29 0a 20 7b 0a 20 20 20 20 20 int *)). {.
0070: 69 66 20 28 2a 74 6f 6b 2d 3e 74 6f 6b 57 6f 72 if (*tok->tokWor
0080: 64 2e 73 74 61 72 74 20 3d 3d 20 27 7a 27 29 20 d.start == 'z')
0090: 7b 0a 2d 09 69 6e 74 20 7a 20 3d 20 64 61 74 65 {.-.int z = date
00a0: 46 6d 74 2d 3e 64 61 74 65 2e 74 7a 4f 66 66 73 Fmt->date.tzOffs
00b0: 65 74 3b 0a 2b 09 54 63 6c 5f 57 69 64 65 49 6e et;.+.Tcl_WideIn
00c0: 74 20 7a 20 3d 20 64 61 74 65 46 6d 74 2d 3e 64 t z = dateFmt->d
00d0: 61 74 65 2e 74 7a 4f 66 66 73 65 74 3b 0a 20 09 ate.tzOffset;. .
00e0: 63 68 61 72 20 73 69 67 6e 20 3d 20 27 2b 27 3b char sign = '+';
00f0: 0a 20 0a 20 09 69 66 20 28 7a 20 3c 20 30 29 20 . . .if (z < 0)
0100: 7b 0a 20 09 20 20 20 20 7a 20 3d 20 2d 7a 3b 0a {. . z = -z;.
0110: 20 09 20 20 20 20 73 69 67 6e 20 3d 20 27 2d 27 . sign = '-'
0120: 3b 0a 20 09 7d 0a 2d 09 69 66 20 28 46 72 6d 52 ;. .}.-.if (FrmR
0130: 65 73 75 6c 74 41 6c 6c 6f 63 61 74 65 28 64 61 esultAllocate(da
0140: 74 65 46 6d 74 2c 20 37 29 20 21 3d 20 54 43 4c teFmt, 7) != TCL
0150: 5f 4f 4b 29 20 7b 0a 2b 09 2f 2a 0a 2b 09 20 2a _OK) {.+./*.+. *
0160: 20 53 69 67 6e 2c 20 68 6f 75 72 73 2c 20 6d 69 Sign, hours, mi
0170: 6e 75 74 65 73 20 61 6e 64 20 73 65 63 6f 6e 64 nutes and second
0180: 73 2e 20 54 68 65 20 6f 66 66 73 65 74 20 69 73 s. The offset is
0190: 20 61 20 33 32 2d 62 69 74 20 76 61 6c 75 65 2c a 32-bit value,
01a0: 20 73 6f 0a 2b 09 20 2a 20 74 68 65 20 68 6f 75 so.+. * the hou
01b0: 72 73 20 74 61 6b 65 20 75 70 20 74 6f 20 36 20 rs take up to 6
01c0: 64 69 67 69 74 73 3a 20 2b 68 68 68 68 68 68 6d digits: +hhhhhhm
01d0: 6d 73 73 20 69 73 20 61 74 20 6d 6f 73 74 20 31 mss is at most 1
01e0: 31 20 63 68 61 72 73 2e 0a 2b 09 20 2a 2f 0a 2b 1 chars..+. */.+
01f0: 09 69 66 20 28 46 72 6d 52 65 73 75 6c 74 41 6c .if (FrmResultAl
0200: 6c 6f 63 61 74 65 28 64 61 74 65 46 6d 74 2c 20 locate(dateFmt,
0210: 31 31 29 20 21 3d 20 54 43 4c 5f 4f 4b 29 20 7b 11) != TCL_OK) {
0220: 0a 20 09 20 20 20 20 72 65 74 75 72 6e 20 54 43 . . return TC
0230: 4c 5f 45 52 52 4f 52 3b 0a 20 09 7d 0a 20 09 2a L_ERROR;. .}. .*
0240: 64 61 74 65 46 6d 74 2d 3e 6f 75 74 70 75 74 2b dateFmt->output+
0250: 2b 20 3d 20 73 69 67 6e 3b 0a 2d 09 64 61 74 65 + = sign;.-.date
0260: 46 6d 74 2d 3e 6f 75 74 70 75 74 20 3d 20 43 6c Fmt->output = Cl
0270: 6f 63 6b 5f 69 74 6f 61 77 28 64 61 74 65 46 6d ock_itoaw(dateFm
0280: 74 2d 3e 6f 75 74 70 75 74 2c 20 7a 20 2f 20 33 t->output, z / 3
0290: 36 30 30 2c 20 27 30 27 2c 20 32 29 3b 0a 2b 09 600, '0', 2);.+.
02a0: 64 61 74 65 46 6d 74 2d 3e 6f 75 74 70 75 74 20 dateFmt->output
02b0: 3d 20 43 6c 6f 63 6b 5f 69 74 6f 61 77 28 64 61 = Clock_itoaw(da
02c0: 74 65 46 6d 74 2d 3e 6f 75 74 70 75 74 2c 20 28 teFmt->output, (
02d0: 69 6e 74 29 28 7a 20 2f 20 33 36 30 30 29 2c 20 int)(z / 3600),
02e0: 27 30 27 2c 20 32 29 3b 0a 20 09 7a 20 25 3d 20 '0', 2);. .z %=
02f0: 33 36 30 30 3b 0a 2d 09 64 61 74 65 46 6d 74 2d 3600;.-.dateFmt-
0300: 3e 6f 75 74 70 75 74 20 3d 20 43 6c 6f 63 6b 5f >output = Clock_
0310: 69 74 6f 61 77 28 64 61 74 65 46 6d 74 2d 3e 6f itoaw(dateFmt->o
0320: 75 74 70 75 74 2c 20 7a 20 2f 20 36 30 2c 20 27 utput, z / 60, '
0330: 30 27 2c 20 32 29 3b 0a 2b 09 64 61 74 65 46 6d 0', 2);.+.dateFm
0340: 74 2d 3e 6f 75 74 70 75 74 20 3d 20 43 6c 6f 63 t->output = Cloc
0350: 6b 5f 69 74 6f 61 77 28 64 61 74 65 46 6d 74 2d k_itoaw(dateFmt-
0360: 3e 6f 75 74 70 75 74 2c 20 28 69 6e 74 29 28 7a >output, (int)(z
0370: 20 2f 20 36 30 29 2c 20 27 30 27 2c 20 32 29 3b / 60), '0', 2);
0380: 0a 20 09 7a 20 25 3d 20 36 30 3b 0a 20 09 69 66 . .z %= 60;. .if
0390: 20 28 7a 20 21 3d 20 30 29 20 7b 0a 2d 09 20 20 (z != 0) {.-.
03a0: 20 20 64 61 74 65 46 6d 74 2d 3e 6f 75 74 70 75 dateFmt->outpu
03b0: 74 20 3d 20 43 6c 6f 63 6b 5f 69 74 6f 61 77 28 t = Clock_itoaw(
03c0: 64 61 74 65 46 6d 74 2d 3e 6f 75 74 70 75 74 2c dateFmt->output,
03d0: 20 7a 2c 20 27 30 27 2c 20 32 29 3b 0a 2b 09 20 z, '0', 2);.+.
03e0: 20 20 20 64 61 74 65 46 6d 74 2d 3e 6f 75 74 70 dateFmt->outp
03f0: 75 74 20 3d 20 43 6c 6f 63 6b 5f 69 74 6f 61 77 ut = Clock_itoaw
0400: 28 64 61 74 65 46 6d 74 2d 3e 6f 75 74 70 75 74 (dateFmt->output
0410: 2c 20 28 69 6e 74 29 7a 2c 20 27 30 27 2c 20 32 , (int)z, '0', 2
0420: 29 3b 0a 20 09 7d 0a 20 20 20 20 20 7d 20 65 6c );. .}. } el
0430: 73 65 20 7b 0a 20 09 54 63 6c 5f 4f 62 6a 20 2a se {. .Tcl_Obj *
0440: 20 6f 62 6a 50 74 72 3b 0a 2d 2d 2d 20 61 2f 74 objPtr;.--- a/t
0450: 65 73 74 73 2f 63 6c 6f 63 6b 2e 74 65 73 74 0a ests/clock.test.
0460: 2b 2b 2b 20 62 2f 74 65 73 74 73 2f 63 6c 6f 63 +++ b/tests/cloc
0470: 6b 2e 74 65 73 74 0a 40 40 20 2d 33 38 39 30 32 k.test.@@ -38902
0480: 2c 36 20 2b 33 38 39 30 32 2c 33 32 20 40 40 0a ,6 +38902,32 @@.
0490: 20 20 20 20 20 6c 69 73 74 20 5b 63 6c 6f 63 6b list [clock
04a0: 20 66 6f 72 6d 61 74 20 30 20 2d 67 6d 74 20 31 format 0 -gmt 1
04b0: 20 2d 6c 6f 63 61 6c 65 20 68 65 20 2d 66 6f 72 -locale he -for
04c0: 6d 61 74 20 25 45 45 5d 20 5c 0a 20 09 5b 63 6c mat %EE] \. .[cl
04d0: 6f 63 6b 20 66 6f 72 6d 61 74 20 2d 36 32 32 30 ock format -6220
04e0: 30 30 30 30 30 30 30 20 2d 67 6d 74 20 31 20 2d 0000000 -gmt 1 -
04f0: 6c 6f 63 61 6c 65 20 68 65 20 2d 66 6f 72 6d 61 locale he -forma
0500: 74 20 25 45 45 5d 0a 20 7d 20 2d 72 65 73 75 6c t %EE]. } -resul
0510: 74 20 5b 6c 69 73 74 20 22 5c 75 30 35 64 63 5c t [list "\u05dc\
0520: 75 30 35 65 31 5c 75 30 35 64 34 5c 22 5c 75 30 u05e1\u05d4\"\u0
0530: 35 65 30 22 20 22 5c 75 30 35 64 63 5c 75 30 35 5e0" "\u05dc\u05
0540: 65 34 5c 75 30 35 65 31 5c 75 30 35 64 34 5c 22 e4\u05e1\u05d4\"
0550: 5c 75 30 35 65 30 22 5d 0a 2b 0a 2b 74 65 73 74 \u05e0"].+.+test
0560: 20 63 6c 6f 63 6b 2d 37 32 2e 31 20 7b 25 7a 20 clock-72.1 {%z
0570: 77 69 74 68 20 61 6e 20 6f 66 66 73 65 74 20 6f with an offset o
0580: 66 20 31 30 30 20 68 6f 75 72 73 20 6f 72 20 6d f 100 hours or m
0590: 6f 72 65 20 61 74 20 74 68 65 20 65 6e 64 20 6f ore at the end o
05a0: 66 20 74 68 65 20 73 74 61 63 6b 20 62 75 66 66 f the stack buff
05b0: 65 72 7d 20 2d 62 6f 64 79 20 7b 0a 2b 20 20 20 er} -body {.+
05c0: 20 63 6c 6f 63 6b 20 66 6f 72 6d 61 74 20 30 20 clock format 0
05d0: 2d 74 69 6d 65 7a 6f 6e 65 20 2b 39 39 3a 39 39 -timezone +99:99
05e0: 3a 39 39 20 2d 66 6f 72 6d 61 74 20 22 5b 73 74 :99 -format "[st
05f0: 72 69 6e 67 20 72 65 70 65 61 74 20 61 20 37 32 ring repeat a 72
0600: 5d 25 7a 22 0a 2b 7d 20 2d 72 65 73 75 6c 74 20 ]%z".+} -result
0610: 22 5b 73 74 72 69 6e 67 20 72 65 70 65 61 74 20 "[string repeat
0620: 61 20 37 32 5d 2b 31 30 30 34 30 33 39 22 0a 2b a 72]+1004039".+
0630: 74 65 73 74 20 63 6c 6f 63 6b 2d 37 32 2e 32 20 test clock-72.2
0640: 7b 25 7a 20 77 69 74 68 20 61 6e 20 6f 66 66 73 {%z with an offs
0650: 65 74 20 6f 66 20 31 30 30 20 68 6f 75 72 73 20 et of 100 hours
0660: 6f 72 20 6d 6f 72 65 20 61 74 20 74 68 65 20 65 or more at the e
0670: 6e 64 20 6f 66 20 61 20 68 65 61 70 20 62 75 66 nd of a heap buf
0680: 66 65 72 7d 20 2d 62 6f 64 79 20 7b 0a 2b 20 20 fer} -body {.+
0690: 20 20 63 6c 6f 63 6b 20 66 6f 72 6d 61 74 20 30 clock format 0
06a0: 20 2d 74 69 6d 65 7a 6f 6e 65 20 2b 39 39 3a 39 -timezone +99:9
06b0: 39 3a 39 39 20 5c 0a 2b 09 2d 66 6f 72 6d 61 74 9:99 \.+.-format
06c0: 20 22 5b 73 74 72 69 6e 67 20 72 65 70 65 61 74 "[string repeat
06d0: 20 61 20 31 30 30 5d 25 59 5b 73 74 72 69 6e 67 a 100]%Y[string
06e0: 20 72 65 70 65 61 74 20 62 20 31 34 38 5d 25 7a repeat b 148]%z
06f0: 22 0a 2b 7d 20 2d 72 65 73 75 6c 74 20 22 5b 73 ".+} -result "[s
0700: 74 72 69 6e 67 20 72 65 70 65 61 74 20 61 20 31 tring repeat a 1
0710: 30 30 5d 31 39 37 30 5b 73 74 72 69 6e 67 20 72 00]1970[string r
0720: 65 70 65 61 74 20 62 20 31 34 38 5d 2b 31 30 30 epeat b 148]+100
0730: 34 30 33 39 22 0a 2b 74 65 73 74 20 63 6c 6f 63 4039".+test cloc
0740: 6b 2d 37 32 2e 33 20 7b 25 7a 20 77 69 74 68 20 k-72.3 {%z with
0750: 74 68 65 20 6c 61 72 67 65 73 74 20 33 32 2d 62 the largest 32-b
0760: 69 74 20 6f 66 66 73 65 74 7d 20 2d 73 65 74 75 it offset} -setu
0770: 70 20 7b 0a 2b 20 20 20 20 63 6c 6f 63 6b 20 66 p {.+ clock f
0780: 6f 72 6d 61 74 20 30 20 2d 67 6d 74 20 31 0a 2b ormat 0 -gmt 1.+
0790: 20 20 20 20 73 65 74 20 3a 3a 74 63 6c 3a 3a 63 set ::tcl::c
07a0: 6c 6f 63 6b 3a 3a 54 5a 44 61 74 61 28 3a 63 6c lock::TZData(:cl
07b0: 6f 63 6b 2d 37 32 2e 33 29 20 5c 0a 2b 09 7b 7b ock-72.3) \.+.{{
07c0: 2d 39 32 32 33 33 37 32 30 33 36 38 35 34 37 37 -922337203685477
07d0: 35 38 30 38 20 32 31 34 37 34 38 33 36 34 37 20 5808 2147483647
07e0: 30 20 63 6c 6f 63 6b 2d 37 32 2e 33 7d 7d 0a 2b 0 clock-72.3}}.+
07f0: 7d 20 2d 62 6f 64 79 20 7b 0a 2b 20 20 20 20 63 } -body {.+ c
0800: 6c 6f 63 6b 20 66 6f 72 6d 61 74 20 30 20 2d 74 lock format 0 -t
0810: 69 6d 65 7a 6f 6e 65 20 3a 63 6c 6f 63 6b 2d 37 imezone :clock-7
0820: 32 2e 33 20 2d 66 6f 72 6d 61 74 20 22 5b 73 74 2.3 -format "[st
0830: 72 69 6e 67 20 72 65 70 65 61 74 20 61 20 37 32 ring repeat a 72
0840: 5d 25 7a 22 0a 2b 7d 20 2d 63 6c 65 61 6e 75 70 ]%z".+} -cleanup
0850: 20 7b 0a 2b 20 20 20 20 75 6e 73 65 74 20 2d 6e {.+ unset -n
0860: 6f 63 6f 6d 70 6c 61 69 6e 20 3a 3a 74 63 6c 3a ocomplain ::tcl:
0870: 3a 63 6c 6f 63 6b 3a 3a 54 5a 44 61 74 61 28 3a :clock::TZData(:
0880: 63 6c 6f 63 6b 2d 37 32 2e 33 29 0a 2b 7d 20 2d clock-72.3).+} -
0890: 72 65 73 75 6c 74 20 22 5b 73 74 72 69 6e 67 20 result "[string
08a0: 72 65 70 65 61 74 20 61 20 37 32 5d 2b 35 39 36 repeat a 72]+596
08b0: 35 32 33 31 34 30 37 22 0a 2b 74 65 73 74 20 63 5231407".+test c
08c0: 6c 6f 63 6b 2d 37 32 2e 34 20 7b 25 7a 20 77 69 lock-72.4 {%z wi
08d0: 74 68 20 74 68 65 20 73 6d 61 6c 6c 65 73 74 20 th the smallest
08e0: 33 32 2d 62 69 74 20 6f 66 66 73 65 74 7d 20 2d 32-bit offset} -
08f0: 73 65 74 75 70 20 7b 0a 2b 20 20 20 20 63 6c 6f setup {.+ clo
0900: 63 6b 20 66 6f 72 6d 61 74 20 30 20 2d 67 6d 74 ck format 0 -gmt
0910: 20 31 0a 2b 20 20 20 20 73 65 74 20 3a 3a 74 63 1.+ set ::tc
0920: 6c 3a 3a 63 6c 6f 63 6b 3a 3a 54 5a 44 61 74 61 l::clock::TZData
0930: 28 3a 63 6c 6f 63 6b 2d 37 32 2e 34 29 20 5c 0a (:clock-72.4) \.
0940: 2b 09 7b 7b 2d 39 32 32 33 33 37 32 30 33 36 38 +.{{-92233720368
0950: 35 34 37 37 35 38 30 38 20 2d 32 31 34 37 34 38 54775808 -214748
0960: 33 36 34 38 20 30 20 63 6c 6f 63 6b 2d 37 32 2e 3648 0 clock-72.
0970: 34 7d 7d 0a 2b 7d 20 2d 62 6f 64 79 20 7b 0a 2b 4}}.+} -body {.+
0980: 20 20 20 20 63 6c 6f 63 6b 20 66 6f 72 6d 61 74 clock format
0990: 20 30 20 2d 74 69 6d 65 7a 6f 6e 65 20 3a 63 6c 0 -timezone :cl
09a0: 6f 63 6b 2d 37 32 2e 34 20 2d 66 6f 72 6d 61 74 ock-72.4 -format
09b0: 20 22 5b 73 74 72 69 6e 67 20 72 65 70 65 61 74 "[string repeat
09c0: 20 61 20 37 32 5d 25 7a 22 0a 2b 7d 20 2d 63 6c a 72]%z".+} -cl
09d0: 65 61 6e 75 70 20 7b 0a 2b 20 20 20 20 75 6e 73 eanup {.+ uns
09e0: 65 74 20 2d 6e 6f 63 6f 6d 70 6c 61 69 6e 20 3a et -nocomplain :
09f0: 3a 74 63 6c 3a 3a 63 6c 6f 63 6b 3a 3a 54 5a 44 :tcl::clock::TZD
0a00: 61 74 61 28 3a 63 6c 6f 63 6b 2d 37 32 2e 34 29 ata(:clock-72.4)
0a10: 0a 2b 7d 20 2d 72 65 73 75 6c 74 20 22 5b 73 74 .+} -result "[st
0a20: 72 69 6e 67 20 72 65 70 65 61 74 20 61 20 37 32 ring repeat a 72
0a30: 5d 2d 35 39 36 35 32 33 31 34 30 38 22 0a 20 0a ]-5965231408". .
0a40: 20 23 20 63 6c 65 61 6e 75 70 0a 20 0a # cleanup. .
