Issue #22117: Add assertions to _PyTime_AsTimeval() and _PyTime_AsTimespec() to

vstinner · vstinner · commit edddf991d9ea · 2015-03-30T02:54:57.000+02:00
check that microseconds and nanoseconds fits into the specified range.
diff --git a/Python/pytime.c b/Python/pytime.c
@@ -360,6 +360,8 @@ _PyTime_AsTimeval_impl(_PyTime_t t, struct timeval *tv, _PyTime_round_t round,
 
     if (res && raise)
         _PyTime_overflow();
+
+    assert(0 <= tv->tv_usec && tv->tv_usec <= 999999);
     return res;
 }
 
@@ -393,6 +395,8 @@ _PyTime_AsTimespec(_PyTime_t t, struct timespec *ts)
         return -1;
     }
     ts->tv_nsec = nsec;
+
+    assert(0 <= ts->tv_nsec && ts->tv_nsec <= 999999999);
     return 0;
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -360,6 +360,8 @@ _PyTime_AsTimeval_impl(_PyTime_t t, struct timeval *tv, _PyTime_round_t round,`
`360`	`360`
`361`	`361`	`if (res && raise)`
`362`	`362`	`_PyTime_overflow();`
	`363`	`+`
	`364`	`+ assert(0 <= tv->tv_usec && tv->tv_usec <= 999999);`
`363`	`365`	`return res;`
`364`	`366`	`}`
`365`	`367`
`@@ -393,6 +395,8 @@ _PyTime_AsTimespec(_PyTime_t t, struct timespec *ts)`
`393`	`395`	`return -1;`
`394`	`396`	`}`
`395`	`397`	`ts->tv_nsec = nsec;`
	`398`	`+`
	`399`	`+ assert(0 <= ts->tv_nsec && ts->tv_nsec <= 999999999);`
`396`	`400`	`return 0;`
`397`	`401`	`}`
`398`	`402`	`#endif`