Commit 256a16a8 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

if the global_init() is called from within curl_easy_init() and returns 

an error code, we now make curl_easy_init fail and return NULL.
parent 30e0891d

lib/easy.c

+6 −2
Original line number Diff line number Diff line
@@ -198,8 +198,12 @@ CURL *curl_easy_init(void) 
  struct SessionHandle *data;



  /* Make sure we inited the global SSL stuff */

  if (!initialized)

    curl_global_init(CURL_GLOBAL_DEFAULT);

  if (!initialized) {

    res = curl_global_init(CURL_GLOBAL_DEFAULT);

    if(res)

      /* something in the global init failed, return nothing */

      return NULL;

  }



  /* We use curl_open() with undefined URL so far */

  res = Curl_open(&data);