Skip to content

Commit 09dbe18

Browse files
sanyamk23sanyamk23
authored
Merge branch 'master' into fix-issue-21271
2 parents 777bb73 + 42f66fd commit 09dbe18

4 files changed

Lines changed: 52 additions & 24 deletions

File tree

‎mypyc/lib-rt/base64/librt_base64_api.c‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,35 @@ import_librt_base64(void)
99
if (mod == NULL)
1010
return -1;
1111
Py_DECREF(mod); // we import just for the side effect of making the below work.
12-
void *capsule = PyCapsule_Import("librt.base64._C_API", 0);
12+
void **capsule = (void **)PyCapsule_Import("librt.base64._C_API", 0);
1313
if (capsule == NULL)
1414
return -1;
15-
memcpy(LibRTBase64_API, capsule, sizeof(LibRTBase64_API));
16-
if (LibRTBase64_ABIVersion() != LIBRT_BASE64_ABI_VERSION) {
15+
16+
// Only after version validation succeeds can we safely copy the full table.
17+
int (*abi_version)(void) = (int (*)(void))capsule[0];
18+
int (*api_version)(void) = (int (*)(void))capsule[1];
19+
if (abi_version() != LIBRT_BASE64_ABI_VERSION) {
1720
char err[128];
1821
snprintf(err, sizeof(err), "ABI version conflict for librt.base64, expected %d, found %d",
1922
LIBRT_BASE64_ABI_VERSION,
20-
LibRTBase64_ABIVersion()
23+
abi_version()
2124
);
2225
PyErr_SetString(PyExc_ValueError, err);
2326
return -1;
2427
}
25-
if (LibRTBase64_APIVersion() < LIBRT_BASE64_API_VERSION) {
28+
if (api_version() < LIBRT_BASE64_API_VERSION) {
2629
char err[128];
2730
snprintf(err, sizeof(err),
2831
"API version conflict for librt.base64, expected %d or newer, found %d (hint: upgrade librt)",
2932
LIBRT_BASE64_API_VERSION,
30-
LibRTBase64_APIVersion()
33+
api_version()
3134
);
3235
PyErr_SetString(PyExc_ValueError, err);
3336
return -1;
3437
}
38+
// Provider API version is >= our expected version, which (by the API
39+
// compatibility contract) means it has at least LIBRT_BASE64_API_LEN
40+
// entries, so this copy is safe.
41+
memcpy(LibRTBase64_API, capsule, sizeof(LibRTBase64_API));
3542
return 0;
3643
}

‎mypyc/lib-rt/internal/librt_internal_api.c‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,35 @@ import_librt_internal(void)
99
if (mod == NULL)
1010
return -1;
1111
Py_DECREF(mod); // we import just for the side effect of making the below work.
12-
void *capsule = PyCapsule_Import("librt.internal._C_API", 0);
12+
void **capsule = (void **)PyCapsule_Import("librt.internal._C_API", 0);
1313
if (capsule == NULL)
1414
return -1;
15-
memcpy(NativeInternal_API, capsule, sizeof(NativeInternal_API));
16-
if (NativeInternal_ABI_Version() != LIBRT_INTERNAL_ABI_VERSION) {
15+
16+
// Each librt capsule gives at least 20 entries. Validate version before copying the table.
17+
int (*abi_version)(void) = (int (*)(void))capsule[13];
18+
if (abi_version() != LIBRT_INTERNAL_ABI_VERSION) {
1719
char err[128];
1820
snprintf(err, sizeof(err), "ABI version conflict for librt.internal, expected %d, found %d",
1921
LIBRT_INTERNAL_ABI_VERSION,
20-
NativeInternal_ABI_Version()
22+
abi_version()
2123
);
2224
PyErr_SetString(PyExc_ValueError, err);
2325
return -1;
2426
}
25-
if (NativeInternal_API_Version() < LIBRT_INTERNAL_API_VERSION) {
27+
int (*api_version)(void) = (int (*)(void))capsule[19];
28+
if (api_version() < LIBRT_INTERNAL_API_VERSION) {
2629
char err[128];
2730
snprintf(err, sizeof(err),
2831
"API version conflict for librt.internal, expected %d or newer, found %d (hint: upgrade librt)",
2932
LIBRT_INTERNAL_API_VERSION,
30-
NativeInternal_API_Version()
33+
api_version()
3134
);
3235
PyErr_SetString(PyExc_ValueError, err);
3336
return -1;
3437
}
38+
// Provider API version is >= our expected version, which (by the API
39+
// compatibility contract) means it has at least LIBRT_INTERNAL_API_LEN
40+
// entries, so this copy is safe.
41+
memcpy(NativeInternal_API, capsule, sizeof(NativeInternal_API));
3542
return 0;
3643
}

‎mypyc/lib-rt/strings/librt_strings_api.c‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,36 @@ import_librt_strings(void)
2020
if (mod == NULL)
2121
return -1;
2222
Py_DECREF(mod); // we import just for the side effect of making the below work.
23-
void *capsule = PyCapsule_Import("librt.strings._C_API", 0);
23+
void **capsule = (void **)PyCapsule_Import("librt.strings._C_API", 0);
2424
if (capsule == NULL)
2525
return -1;
26-
memcpy(LibRTStrings_API, capsule, sizeof(LibRTStrings_API));
27-
if (LibRTStrings_ABIVersion() != LIBRT_STRINGS_ABI_VERSION) {
26+
27+
// Only after version validation succeeds can we safely copy the full table.
28+
int (*abi_version)(void) = (int (*)(void))capsule[0];
29+
int (*api_version)(void) = (int (*)(void))capsule[1];
30+
if (abi_version() != LIBRT_STRINGS_ABI_VERSION) {
2831
char err[128];
2932
snprintf(err, sizeof(err), "ABI version conflict for librt.strings, expected %d, found %d",
3033
LIBRT_STRINGS_ABI_VERSION,
31-
LibRTStrings_ABIVersion()
34+
abi_version()
3235
);
3336
PyErr_SetString(PyExc_ValueError, err);
3437
return -1;
3538
}
36-
if (LibRTStrings_APIVersion() < LIBRT_STRINGS_API_VERSION) {
39+
if (api_version() < LIBRT_STRINGS_API_VERSION) {
3740
char err[128];
3841
snprintf(err, sizeof(err),
3942
"API version conflict for librt.strings, expected %d or newer, found %d (hint: upgrade librt)",
4043
LIBRT_STRINGS_API_VERSION,
41-
LibRTStrings_APIVersion()
44+
api_version()
4245
);
4346
PyErr_SetString(PyExc_ValueError, err);
4447
return -1;
4548
}
49+
// Provider API version is >= our expected version, which (by the API
50+
// compatibility contract) means it has at least LIBRT_STRINGS_API_LEN
51+
// entries, so this copy is safe.
52+
memcpy(LibRTStrings_API, capsule, sizeof(LibRTStrings_API));
4653
return 0;
4754
}
4855

‎mypyc/lib-rt/time/librt_time_api.c‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,35 @@ import_librt_time(void)
99
if (mod == NULL)
1010
return -1;
1111
Py_DECREF(mod); // we import just for the side effect of making the below work.
12-
void *capsule = PyCapsule_Import("librt.time._C_API", 0);
12+
void **capsule = (void **)PyCapsule_Import("librt.time._C_API", 0);
1313
if (capsule == NULL)
1414
return -1;
15-
memcpy(LibRTTime_API, capsule, sizeof(LibRTTime_API));
16-
if (LibRTTime_ABIVersion() != LIBRT_TIME_ABI_VERSION) {
15+
16+
// Only after version validation succeeds can we safely copy the full table.
17+
int (*abi_version)(void) = (int (*)(void))capsule[0];
18+
int (*api_version)(void) = (int (*)(void))capsule[1];
19+
if (abi_version() != LIBRT_TIME_ABI_VERSION) {
1720
char err[128];
1821
snprintf(err, sizeof(err), "ABI version conflict for librt.time, expected %d, found %d",
1922
LIBRT_TIME_ABI_VERSION,
20-
LibRTTime_ABIVersion()
23+
abi_version()
2124
);
2225
PyErr_SetString(PyExc_ValueError, err);
2326
return -1;
2427
}
25-
if (LibRTTime_APIVersion() < LIBRT_TIME_API_VERSION) {
28+
if (api_version() < LIBRT_TIME_API_VERSION) {
2629
char err[128];
2730
snprintf(err, sizeof(err),
2831
"API version conflict for librt.time, expected %d or newer, found %d (hint: upgrade librt)",
2932
LIBRT_TIME_API_VERSION,
30-
LibRTTime_APIVersion()
33+
api_version()
3134
);
3235
PyErr_SetString(PyExc_ValueError, err);
3336
return -1;
3437
}
38+
// Provider API version is >= our expected version, which (by the API
39+
// compatibility contract) means it has at least LIBRT_TIME_API_LEN
40+
// entries, so this copy is safe.
41+
memcpy(LibRTTime_API, capsule, sizeof(LibRTTime_API));
3542
return 0;
3643
}

0 commit comments

Comments
 (0)