Commit d6bb1f1d authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

asiohiper.cpp / evhiperfifo.c: deal with negative timerfunction input 

That means delete the timer.

Reported-by: Michael Kaufmann
Ref: #1253
parent ce73a301

docs/examples/asiohiper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static int multi_timer_cb(CURLM *multi, long timeout_ms, GlobalInfo *g) 
    timer.expires_from_now(boost::posix_time::millisec(timeout_ms));

    timer.async_wait(boost::bind(&timer_cb, _1, g));

  }

  else {

  else if(timeout_ms == 0) {

    /* call timeout function immediately */

    boost::system::error_code error; /*success*/

    timer_cb(error, g);

docs/examples/evhiperfifo.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -124,7 +124,7 @@ static int multi_timer_cb(CURLM *multi, long timeout_ms, GlobalInfo *g) 
    ev_timer_init(&g->timer_event, timer_cb, t, 0.);

    ev_timer_start(g->loop, &g->timer_event);

  }

  else

  else if(timeout_ms == 0)

    timer_cb(g->loop, &g->timer_event, 0);

  return 0;

}