thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 9.0.1913: if_python: undefined behaviour for function pointers

Browse Source 
Problem:  if_python: undefined behaviour for function pointers
Solution: Fix if_python undefined behavior for function pointer casts

Identified by clang 17 UBSAN (see #12745). Make sure to cast function
pointers with the same signature only.

closes: #13122

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
This commit is contained in:
Yee Cheng Chin 2023-09-19 20:30:22 +02:00 committed by Christian Brabandt
parent 6f00d17e8d
commit 2ce070c27a
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/if_py_both.h
View File

@ -5962,14 +5962,15 @@ static struct PyMethodDef CurrentMethods[] = {
};
static void
init_range_cmd(exarg_T *eap)
init_range_cmd(void *arg)
{
exarg_T *eap = (exarg_T*)arg;
RangeStart = eap->line1;
RangeEnd = eap->line2;
}
static void
init_range_eval(typval_T *rettv UNUSED)
init_range_eval(void *rettv UNUSED)
{
RangeStart = (PyInt) curwin->w_cursor.lnum;
RangeEnd = RangeStart;

8
src/if_python.c
View File

@ -1103,7 +1103,7 @@ ex_python(exarg_T *eap)
p_pyx = 2;
DoPyCommand(script == NULL ? (char *) eap->arg : (char *) script,
(rangeinitializer) init_range_cmd,
init_range_cmd,
(runner) run_cmd,
(void *) eap);
}
@ -1154,7 +1154,7 @@ ex_pyfile(exarg_T *eap)
// Execute the file
DoPyCommand(buffer,
(rangeinitializer) init_range_cmd,
init_range_cmd,
(runner) run_cmd,
(void *) eap);
}
@ -1166,7 +1166,7 @@ ex_pydo(exarg_T *eap)
p_pyx = 2;
DoPyCommand((char *)eap->arg,
(rangeinitializer) init_range_cmd,
init_range_cmd,
(runner)run_do,
(void *)eap);
}
@ -1524,7 +1524,7 @@ FunctionGetattr(PyObject *self, char *name)
do_pyeval(char_u *str, typval_T *rettv)
{
DoPyCommand((char *) str,
(rangeinitializer) init_range_eval,
init_range_eval,
(runner) run_eval,
(void *) rettv);
if (rettv->v_type == VAR_UNKNOWN)

8
src/if_python3.c
View File

@ -1425,7 +1425,7 @@ ex_py3(exarg_T *eap)
p_pyx = 3;
DoPyCommand(script == NULL ? (char *) eap->arg : (char *) script,
(rangeinitializer) init_range_cmd,
init_range_cmd,
(runner) run_cmd,
(void *) eap);
}
@ -1491,7 +1491,7 @@ ex_py3file(exarg_T *eap)
// Execute the file
DoPyCommand(buffer,
(rangeinitializer) init_range_cmd,
init_range_cmd,
(runner) run_cmd,
(void *) eap);
}
@ -1503,7 +1503,7 @@ ex_py3do(exarg_T *eap)
p_pyx = 3;
DoPyCommand((char *)eap->arg,
(rangeinitializer)init_range_cmd,
init_range_cmd,
(runner)run_do,
(void *)eap);
}
@ -2053,7 +2053,7 @@ LineToString(const char *str)
do_py3eval(char_u *str, typval_T *rettv)
{
DoPyCommand((char *) str,
(rangeinitializer) init_range_eval,
init_range_eval,
(runner) run_eval,
(void *) rettv);
if (rettv->v_type == VAR_UNKNOWN)

2
src/version.c
View File

@ -699,6 +699,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1913,
/**/
1912,
/**/