Tk Source Code

Check-in [8038fd23]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix broken build (one line of the patch was missing)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | bug-382712ade6
Files: files | file ages | folders
SHA3-256: 8038fd23ea235ea4ad536fc908f202d371649dcdd8bde2eb8487e1274280fc62
User & Date: fvogel 2018-01-18 14:23:04
Context
2018-05-03
06:07
merge core-8-6-branch check-in: 97905640 user: fvogel tags: bug-382712ade6
2018-01-18
14:23
Fix broken build (one line of the patch for [382712ade6] was missing) check-in: 89cf5e33 user: fvogel tags: core-8-6-branch
14:23
Fix broken build (one line of the patch was missing) check-in: 8038fd23 user: fvogel tags: bug-382712ade6
2018-01-10
20:45
Fix [382712ade6]: X11: 'event generate . <KeyPress>' segfaults. Patch from Christian Werner. check-in: 2f691822 user: fvogel tags: bug-382712ade6
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to unix/tkUnixKey.c.

239
240
241
242
243
244
245

246
247
248
249
250
251
252

    /*
     * Cache the string in the event so that if/when we return to this
     * function, we will be able to produce it without asking X. This stops us
     * from having to reenter the XIM engine. [Bug 1373712]
     */


    kePtr->charValuePtr = ckalloc(len + 1);
    kePtr->charValueLen = len;
    memcpy(kePtr->charValuePtr, Tcl_DStringValue(dsPtr), (unsigned) len + 1);
    return Tcl_DStringValue(dsPtr);
}

/*







>







239
240
241
242
243
244
245
246
247
248
249
250
251
252
253

    /*
     * Cache the string in the event so that if/when we return to this
     * function, we will be able to produce it without asking X. This stops us
     * from having to reenter the XIM engine. [Bug 1373712]
     */

done:
    kePtr->charValuePtr = ckalloc(len + 1);
    kePtr->charValueLen = len;
    memcpy(kePtr->charValuePtr, Tcl_DStringValue(dsPtr), (unsigned) len + 1);
    return Tcl_DStringValue(dsPtr);
}

/*