3360. [bug] 'host -w' could die. [RT #18723]

This commit is contained in:
Mark Andrews 2012-08-14 11:05:29 +10:00
parent 5533509459
commit f06dad6860
2 changed files with 10 additions and 1 deletions

View file

@ -1,3 +1,5 @@
3360. [bug] 'host -w' could die. [RT #18723]
3359. [bug] An improperly-formed TSIG secret could cause a
memory leak. [RT #30607]

View file

@ -43,7 +43,14 @@ isc_condition_waituntil(isc_condition_t *c, isc_mutex_t *m, isc_time_t *t) {
* POSIX defines a timespec's tv_sec as time_t.
*/
result = isc_time_secondsastimet(t, &ts.tv_sec);
if (result != ISC_R_SUCCESS)
/*
* If we have a range error ts.tv_sec is most probably a signed
* 32 bit value. Set ts.tv_sec to INT_MAX. This is a kludge.
*/
if (result == ISC_R_RANGE)
ts.tv_sec = INT_MAX;
else if (result != ISC_R_SUCCESS)
return (result);
/*!