diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-07-27 15:13:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-07-27 15:13:36 (GMT) |
| commit | 8225b1fd250bbd3d71a52ca514ae343a91dfcdc5 (patch) | |
| tree | a91dde691bf66a3e79e57ac8058f0ab98348bc68 /unix/tclLoadDl.c | |
| parent | af64c95042a9706c6d45118c8f341aafa5c26686 (diff) | |
| parent | 192dc7dffdb4bd9d434e1f54830711df4fed4672 (diff) | |
| download | tcl-8225b1fd250bbd3d71a52ca514ae343a91dfcdc5.zip tcl-8225b1fd250bbd3d71a52ca514ae343a91dfcdc5.tar.gz tcl-8225b1fd250bbd3d71a52ca514ae343a91dfcdc5.tar.bz2 | |
Rebase to 9.0. Add more filname encoding checks
Diffstat (limited to 'unix/tclLoadDl.c')
| -rw-r--r-- | unix/tclLoadDl.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/unix/tclLoadDl.c b/unix/tclLoadDl.c index 0913698..743e94f 100644 --- a/unix/tclLoadDl.c +++ b/unix/tclLoadDl.c @@ -108,7 +108,11 @@ TclpDlopen( Tcl_DString ds; const char *fileName = TclGetString(pathPtr); - native = Tcl_UtfToExternalDString(NULL, fileName, TCL_INDEX_NONE, &ds); + if (Tcl_UtfToExternalDStringEx(interp, NULL, fileName, TCL_INDEX_NONE, 0, &ds, NULL) != TCL_OK) { + Tcl_DStringFree(&ds); + return TCL_ERROR; + } + native = Tcl_DStringValue(&ds); /* * Use (RTLD_NOW|RTLD_LOCAL) as default, see [Bug #3216070] */ @@ -179,7 +183,11 @@ FindSymbol( * the underscore. */ - native = Tcl_UtfToExternalDString(NULL, symbol, TCL_INDEX_NONE, &ds); + if (Tcl_UtfToExternalDStringEx(interp, NULL, symbol, TCL_INDEX_NONE, 0, &ds, NULL) != TCL_OK) { + Tcl_DStringFree(&ds); + return NULL; + } + native = Tcl_DStringValue(&ds); proc = dlsym(handle, native); /* INTL: Native. */ if (proc == NULL) { Tcl_DStringInit(&newName); |