Commit a1fc9b80 authored by Daniel Stenberg's avatar Daniel Stenberg Committed by Yang Tse
Browse files

curl_multi_wait: avoid an unnecessary memory allocation

parent dfe382c6

lib/multi.c

+4 −3
Original line number Diff line number Diff line
@@ -900,7 +900,7 @@ CURLMcode curl_multi_wait(CURLM *multi_handle, 
  int bitmap;

  unsigned int i;

  unsigned int nfds = extra_nfds;

  struct pollfd *ufds;

  struct pollfd *ufds = NULL;



  if(!GOOD_MULTI_HANDLE(multi))

    return CURLM_BAD_HANDLE;
@@ -929,6 +929,7 @@ CURLMcode curl_multi_wait(CURLM *multi_handle, 
    easy = easy->next; /* check next handle */

  }



  if(nfds)

    ufds = (struct pollfd *)malloc(nfds * sizeof(struct pollfd));

  nfds = 0;
@@ -979,7 +980,7 @@ CURLMcode curl_multi_wait(CURLM *multi_handle, 
  else

    i = 0;



  free(ufds);

  Curl_safefree(ufds);

  if(ret)

    *ret = i;

  return CURLM_OK;