Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Merge 8.6 |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | core-8-branch |
| Files: | files | file ages | folders |
| SHA3-256: |
77177853ed4822d2ff6945e275a7d0a2 |
| User & Date: | oehhar 2024-06-18 08:40:28 |
Context
|
2024-06-18
| ||
| 15:01 | Add braces, indenting check-in: 569ae117 user: jan.nijtmans tags: core-8-branch | |
| 08:44 | Merge 8.7 check-in: 3904bd59 user: oehhar tags: trunk, main | |
| 08:40 | Merge 8.6 check-in: 77177853 user: oehhar tags: core-8-branch | |
| 08:30 | Ticket [865af014]: add error message on corrupt gif file check-in: fc6f7369 user: oehhar tags: core-8-6-branch | |
|
2024-06-17
| ||
| 13:14 | "less than 0" -> negative, as everywhere else in the documentation check-in: f5dedd94 user: jan.nijtmans tags: core-8-branch | |
Changes
Changes to generic/tkImgGIF.c.
| ︙ | ︙ | |||
494 495 496 497 498 499 500 |
}
/*
* Get the general colormap information.
*/
if (Fread(gifConfPtr, buf, 1, 3, chan) != 3) {
| > > > > > > | | 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 |
}
/*
* Get the general colormap information.
*/
if (Fread(gifConfPtr, buf, 1, 3, chan) != 3) {
/*
* Bug [865af0148c]: 3 bytes should be there, but data ended before
*/
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"GIF file truncated", -1));
Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "TRUNCATED", NULL);
return TCL_ERROR;
}
bitPixel = 2 << (buf[0] & 0x07);
if (BitSet(buf[0], LOCALCOLORMAP)) { /* Global Colormap */
if (!ReadColorMap(gifConfPtr, chan, bitPixel, colorMap)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"error reading color map", TCL_INDEX_NONE));
|
| ︙ | ︙ |
Added tests/corruptTruncatedColormap.gif.
cannot compute difference between binary files
Changes to tests/imgPhoto.test.
| ︙ | ︙ | |||
1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 |
test imgPhoto-20.6 {Reject truncated GIF (file)} -setup {
set fileName [file join [file dirname [info script]] corruptTruncated.gif]
} -body {
image create photo gif1 -file $fileName
} -cleanup {
catch {image delete gif1}
} -returnCodes error -result {error reading color map}
test imgPhoto-20.7 {Reject corrupted GIF (> 4Gb) (binary string)} -constraints {
nonPortable
} -setup {
# About the non portability constraint of this test: see ticket [cc42cc18a5]
# If there is insufficient memory, the error message
# {not enough free memory for image buffer} should be returned.
# Instead, some systems (e.g. FreeBSD 11.1) terminate the test interpreter.
| > > > > > > > > > > > > > > > > > | 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 |
test imgPhoto-20.6 {Reject truncated GIF (file)} -setup {
set fileName [file join [file dirname [info script]] corruptTruncated.gif]
} -body {
image create photo gif1 -file $fileName
} -cleanup {
catch {image delete gif1}
} -returnCodes error -result {error reading color map}
test imgPhoto-20.6.1 {Reject truncated GIF in Colormap - ticket 865af0148c - file} -setup {
set fileName [file join [file dirname [info script]] corruptTruncatedColormap.gif]
} -body {
image create photo gif1 -file $fileName
} -cleanup {
catch {image delete gif1}
} -returnCodes error -result {GIF file truncated}
test imgPhoto-20.6.2 {Reject truncated GIF in Colormap - ticket 865af0148c - data} -setup {
set fileName [file join [file dirname [info script]] corruptTruncatedColormap.gif]
set h [open $fileName rb]
set d [read $h]
close $h
} -body {
image create photo gif1 -data $d
} -cleanup {
catch {image delete gif1}
} -returnCodes error -result {GIF file truncated}
test imgPhoto-20.7 {Reject corrupted GIF (> 4Gb) (binary string)} -constraints {
nonPortable
} -setup {
# About the non portability constraint of this test: see ticket [cc42cc18a5]
# If there is insufficient memory, the error message
# {not enough free memory for image buffer} should be returned.
# Instead, some systems (e.g. FreeBSD 11.1) terminate the test interpreter.
|
| ︙ | ︙ |