Unverified Commit afc00e04 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

singlesocket: fix the 'sincebefore' placement 

The variable wasn't properly reset within the loop and thus could remain
set for sockets that hadn't been set before and miss notifying the app.

This is a follow-up to 4c35574b (shipped in curl 7.64.0)

Reported-by: buzo-ffm on github
Detected-by: Jan Alexander Steffens
Fixes #3585
Closes #3589
parent b08898fb

lib/multi.c

+2 −2
Original line number Diff line number Diff line
@@ -2349,8 +2349,6 @@ static CURLMcode singlesocket(struct Curl_multi *multi, 
  int num;

  unsigned int curraction;

  int actions[MAX_SOCKSPEREASYHANDLE];

  unsigned int comboaction;

  bool sincebefore = FALSE;



  for(i = 0; i< MAX_SOCKSPEREASYHANDLE; i++)

    socks[i] = CURL_SOCKET_BAD;
@@ -2369,6 +2367,8 @@ static CURLMcode singlesocket(struct Curl_multi *multi, 
      i++) {

    unsigned int action = CURL_POLL_NONE;

    unsigned int prevaction = 0;

    unsigned int comboaction;

    bool sincebefore = FALSE;



    s = socks[i];