mirror of https://github.com/python/cpython
Merge
This commit is contained in:
commit
6297fecbd1
|
@ -122,7 +122,8 @@ static long r_long(RFILE *p)
|
||||||
|
|
||||||
/* Coverity doesn't understand that fdopendir() may take ownership of fd. */
|
/* Coverity doesn't understand that fdopendir() may take ownership of fd. */
|
||||||
|
|
||||||
DIR *fdopendir(int fd) {
|
DIR *fdopendir(int fd)
|
||||||
|
{
|
||||||
DIR *d;
|
DIR *d;
|
||||||
if (d) {
|
if (d) {
|
||||||
__coverity_close__(fd);
|
__coverity_close__(fd);
|
||||||
|
@ -130,3 +131,58 @@ DIR *fdopendir(int fd) {
|
||||||
return d;
|
return d;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Modules/_datetime.c
|
||||||
|
*
|
||||||
|
* Coverity thinks that the input values for these function come from a
|
||||||
|
* tainted source PyDateTime_DATE_GET_* macros use bit shifting.
|
||||||
|
*/
|
||||||
|
static PyObject *
|
||||||
|
build_struct_time(int y, int m, int d, int hh, int mm, int ss, int dstflag)
|
||||||
|
{
|
||||||
|
PyObject *result;
|
||||||
|
|
||||||
|
__coverity_tainted_data_sanitize__(y);
|
||||||
|
__coverity_tainted_data_sanitize__(m);
|
||||||
|
__coverity_tainted_data_sanitize__(d);
|
||||||
|
__coverity_tainted_data_sanitize__(hh);
|
||||||
|
__coverity_tainted_data_sanitize__(mm);
|
||||||
|
__coverity_tainted_data_sanitize__(ss);
|
||||||
|
__coverity_tainted_data_sanitize__(dstflag);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
ymd_to_ord(int year, int month, int day)
|
||||||
|
{
|
||||||
|
int ord = 0;
|
||||||
|
|
||||||
|
__coverity_tainted_data_sanitize__(year);
|
||||||
|
__coverity_tainted_data_sanitize__(month);
|
||||||
|
__coverity_tainted_data_sanitize__(day);
|
||||||
|
|
||||||
|
return ord;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
normalize_date(int *year, int *month, int *day)
|
||||||
|
{
|
||||||
|
__coverity_tainted_data_sanitize__(*year);
|
||||||
|
__coverity_tainted_data_sanitize__(*month);
|
||||||
|
__coverity_tainted_data_sanitize__(*day);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
weekday(int year, int month, int day)
|
||||||
|
{
|
||||||
|
int w = 0;
|
||||||
|
|
||||||
|
__coverity_tainted_data_sanitize__(year);
|
||||||
|
__coverity_tainted_data_sanitize__(month);
|
||||||
|
__coverity_tainted_data_sanitize__(day);
|
||||||
|
|
||||||
|
return w;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue