cpython-lru_cache-weakref: Python/dynload

annotate Python/dynload_mac.c @ 22621:830c829a7eb2 legacy-trunk

Fix an issue that was reported in but unrelated to the main problem of SF bug 535905 (Evil Trashcan and GC interaction). The SETLOCAL() macro should not DECREF the local variable in-place and then store the new value; it should copy the old value to a temporary value, then store the new value, and then DECREF the temporary value. This is because it is possible that during the DECREF the frame is accessed by other code (e.g. a __del__ method or gc.collect()) and the variable would be pointing to already-freed memory. BUGFIX CANDIDATE!

author	Guido van Rossum <guido@python.org>
date	Thu, 28 Mar 2002 20:17:52 +0000
parents	379fc66f4c96
children	ed28b9752f8d

rev	line source
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	1
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Support for dynamic loading of extension modules */
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	3
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	4 #include "Python.h"
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	5 #include "importdl.h"
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	6
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	7 #include <Aliases.h>
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	8 #include <CodeFragments.h>
12476 3500c4350f62 Jack Jansen: The new version of the GUSI i/o library on the Macintosh Guido van Rossum <guido@python.org> parents: 11756 diff changeset	9 #ifdef USE_GUSI1
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	10 #include "TFileSpec.h" /* for Path2FSSpec() */
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	11 #endif
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	12 #include <Files.h>
15537 50358d64dc43 Use c2pstr() in stead of Pstring() to convert C-strings to Jack Jansen <jack.jansen@cwi.nl> parents: 14375 diff changeset	13 #include <TextUtils.h>
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	14 #include "macdefs.h"
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	15 #include "macglue.h"
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	16
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	17
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	18 const struct filedescr _PyImport_DynLoadFiletab[] = {
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	19 {".slb", "rb", C_EXTENSION},
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	20 #ifdef __CFM68K__
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	21 {".CFM68K.slb", "rb", C_EXTENSION},
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	22 #else
16055 64fab0047a14 Use #if TARGET_API_MAC_CARBON to determine carbon/classic macos, not #ifdef. Jack Jansen <jack.jansen@cwi.nl> parents: 15879 diff changeset	23 #if TARGET_API_MAC_CARBON
15879 90992c82d46e Added a separate extension (.carbon.slb) for Carbon dynamic modules. Jack Jansen <jack.jansen@cwi.nl> parents: 15537 diff changeset	24 {".carbon.slb", "rb", C_EXTENSION},
90992c82d46e Added a separate extension (.carbon.slb) for Carbon dynamic modules. Jack Jansen <jack.jansen@cwi.nl> parents: 15537 diff changeset	25 #else
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	26 {".ppc.slb", "rb", C_EXTENSION},
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	27 #endif
15879 90992c82d46e Added a separate extension (.carbon.slb) for Carbon dynamic modules. Jack Jansen <jack.jansen@cwi.nl> parents: 15537 diff changeset	28 #endif
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	29 {0, 0}
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	30 };
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	31
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	32
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11599 diff changeset	33 dl_funcptr _PyImport_GetDynLoadFunc(const char fqname, const char shortname,
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	34 const char pathname, FILE fp)
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	35 {
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	36 dl_funcptr p;
11618 528559a0b2f2 Cleanup patches from Greg Stein: Guido van Rossum <guido@python.org> parents: 11599 diff changeset	37 char funcname[258];
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	38
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	39 /*
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	40 ** Dynamic loading of CFM shared libraries on the Mac. The
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	41 ** code has become more convoluted than it was, because we
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	42 ** want to be able to put multiple modules in a single
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	43 ** file. For this reason, we have to determine the fragment
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	44 ** name, and we cannot use the library entry point but we have
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	45 ** to locate the correct init routine "by hand".
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	46 */
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	47 FSSpec libspec;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	48 CFragConnectionID connID;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	49 Ptr mainAddr;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	50 Str255 errMessage;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	51 OSErr err;
12476 3500c4350f62 Jack Jansen: The new version of the GUSI i/o library on the Macintosh Guido van Rossum <guido@python.org> parents: 11756 diff changeset	52 #ifndef USE_GUSI1
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	53 Boolean isfolder, didsomething;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	54 #endif
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	55 char buf[512];
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	56 Str63 fragname;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	57 Ptr symAddr;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	58 CFragSymbolClass class;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	59
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	60 /* First resolve any aliases to find the real file */
12476 3500c4350f62 Jack Jansen: The new version of the GUSI i/o library on the Macintosh Guido van Rossum <guido@python.org> parents: 11756 diff changeset	61 #ifdef USE_GUSI1
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	62 err = Path2FSSpec(pathname, &libspec);
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	63 #else
15537 50358d64dc43 Use c2pstr() in stead of Pstring() to convert C-strings to Jack Jansen <jack.jansen@cwi.nl> parents: 14375 diff changeset	64 c2pstrcpy((unsigned char *)buf, pathname);
50358d64dc43 Use c2pstr() in stead of Pstring() to convert C-strings to Jack Jansen <jack.jansen@cwi.nl> parents: 14375 diff changeset	65 (void)FSMakeFSSpec(0, 0, (unsigned char *)buf, &libspec);
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	66 err = ResolveAliasFile(&libspec, 1, &isfolder, &didsomething);
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	67 #endif
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	68 if ( err ) {
21077 379fc66f4c96 Use PyOS_snprintf instead of sprintf. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16055 diff changeset	69 PyOS_snprintf(buf, sizeof(buf),
379fc66f4c96 Use PyOS_snprintf instead of sprintf. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16055 diff changeset	70 "%.200s: %.200s", pathname, PyMac_StrError(err));
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	71 PyErr_SetString(PyExc_ImportError, buf);
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	72 return NULL;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	73 }
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	74 /* Next, determine the fragment name,
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	75 by stripping '.slb' and 'module' */
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	76 memcpy(fragname+1, libspec.name+1, libspec.name[0]);
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	77 fragname[0] = libspec.name[0];
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	78 if( strncmp((char *)(fragname+1+fragname[0]-4),
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	79 ".slb", 4) == 0 )
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	80 fragname[0] -= 4;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	81 if ( strncmp((char *)(fragname+1+fragname[0]-6),
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	82 "module", 6) == 0 )
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	83 fragname[0] -= 6;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	84 /* Load the fragment
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	85 (or return the connID if it is already loaded */
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	86 err = GetDiskFragment(&libspec, 0, 0, fragname,
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	87 kLoadCFrag, &connID, &mainAddr,
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	88 errMessage);
11756 6367d829f36b Patch by Jack Jansen: Guido van Rossum <guido@python.org> parents: 11618 diff changeset	89 if ( err == cfragImportTooOldErr \|\| err == cfragImportTooNewErr ) {
6367d829f36b Patch by Jack Jansen: Guido van Rossum <guido@python.org> parents: 11618 diff changeset	90 /*
6367d829f36b Patch by Jack Jansen: Guido van Rossum <guido@python.org> parents: 11618 diff changeset	91 ** Special-case code: if PythonCore is too old or too new this means
6367d829f36b Patch by Jack Jansen: Guido van Rossum <guido@python.org> parents: 11618 diff changeset	92 ** the dynamic module was meant for a different Python.
6367d829f36b Patch by Jack Jansen: Guido van Rossum <guido@python.org> parents: 11618 diff changeset	93 */
6367d829f36b Patch by Jack Jansen: Guido van Rossum <guido@python.org> parents: 11618 diff changeset	94 if (errMessage[0] == 10 && strncmp((char *)errMessage+1, "PythonCore", 10) == 0 ) {
21077 379fc66f4c96 Use PyOS_snprintf instead of sprintf. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16055 diff changeset	95 PyOS_snprintf(buf, sizeof(buf),
379fc66f4c96 Use PyOS_snprintf instead of sprintf. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16055 diff changeset	96 "Dynamic module was built for %s version of MacPython",
379fc66f4c96 Use PyOS_snprintf instead of sprintf. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16055 diff changeset	97 (err == cfragImportTooOldErr ? "a newer" : "an older"));
11756 6367d829f36b Patch by Jack Jansen: Guido van Rossum <guido@python.org> parents: 11618 diff changeset	98 PyErr_SetString(PyExc_ImportError, buf);
6367d829f36b Patch by Jack Jansen: Guido van Rossum <guido@python.org> parents: 11618 diff changeset	99 return NULL;
6367d829f36b Patch by Jack Jansen: Guido van Rossum <guido@python.org> parents: 11618 diff changeset	100 }
6367d829f36b Patch by Jack Jansen: Guido van Rossum <guido@python.org> parents: 11618 diff changeset	101 }
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	102 if ( err ) {
21077 379fc66f4c96 Use PyOS_snprintf instead of sprintf. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16055 diff changeset	103 PyOS_snprintf(buf, sizeof(buf), "%.*s: %.200s",
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	104 errMessage[0], errMessage+1,
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	105 PyMac_StrError(err));
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	106 PyErr_SetString(PyExc_ImportError, buf);
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	107 return NULL;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	108 }
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	109 /* Locate the address of the correct init function */
21077 379fc66f4c96 Use PyOS_snprintf instead of sprintf. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16055 diff changeset	110 PyOS_snprintf(funcname, sizeof(funcname), "init%.200s", shortname);
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	111 err = FindSymbol(connID, Pstring(funcname), &symAddr, &class);
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	112 if ( err ) {
21077 379fc66f4c96 Use PyOS_snprintf instead of sprintf. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16055 diff changeset	113 PyOS_snprintf(buf, sizeof(buf), "%s: %.200s",
379fc66f4c96 Use PyOS_snprintf instead of sprintf. Jeremy Hylton <jeremy@alum.mit.edu> parents: 16055 diff changeset	114 funcname, PyMac_StrError(err));
11599 78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	115 PyErr_SetString(PyExc_ImportError, buf);
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	116 return NULL;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	117 }
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	118 p = (dl_funcptr)symAddr;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	119
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	120 return p;
78fe87ce0ded The old platform-specific contents of importdl.c, broken down into one Guido van Rossum <guido@python.org> parents: diff changeset	121 }

Mercurial > cpython-lru_cache-weakref

annotate Python/dynload_mac.c @ 22621:830c829a7eb2 legacy-trunk