Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 198931
Collapse All | Expand All

(-)curl-7.17.1-20071013.orig/lib/url.c (-5 / +5 lines)
Lines 2074-2080 Link Here
2074
    Curl_ntlm_cleanup(conn);
2074
    Curl_ntlm_cleanup(conn);
2075
  }
2075
  }
2076
2076
2077
  if(conn->handler->disconnect)
2077
  if(conn->handler && conn->handler->disconnect)
2078
    /* This is set if protocol-specific cleanups should be made */
2078
    /* This is set if protocol-specific cleanups should be made */
2079
    conn->handler->disconnect(conn);
2079
    conn->handler->disconnect(conn);
2080
2080
Lines 2594-2600 Link Here
2594
                          curl_socket_t *socks,
2594
                          curl_socket_t *socks,
2595
                          int numsocks)
2595
                          int numsocks)
2596
{
2596
{
2597
  if(conn->handler->proto_getsock)
2597
  if(conn && conn->handler && conn->handler->proto_getsock)
2598
    return conn->handler->proto_getsock(conn, socks, numsocks);
2598
    return conn->handler->proto_getsock(conn, socks, numsocks);
2599
  return GETSOCK_BLANK;
2599
  return GETSOCK_BLANK;
2600
}
2600
}
Lines 4325-4331 Link Here
4325
  }
4325
  }
4326
4326
4327
  /* this calls the protocol-specific function pointer previously set */
4327
  /* this calls the protocol-specific function pointer previously set */
4328
  if(conn->handler->done)
4328
  if(conn->handler && conn->handler->done)
4329
    result = conn->handler->done(conn, status, premature);
4329
    result = conn->handler->done(conn, status, premature);
4330
  else
4330
  else
4331
    result = CURLE_OK;
4331
    result = CURLE_OK;
Lines 4378-4384 Link Here
4378
  conn->bits.done = FALSE; /* Curl_done() is not called yet */
4378
  conn->bits.done = FALSE; /* Curl_done() is not called yet */
4379
  conn->bits.do_more = FALSE; /* by default there's no curl_do_more() to use */
4379
  conn->bits.do_more = FALSE; /* by default there's no curl_do_more() to use */
4380
4380
4381
  if(conn->handler->do_it) {
4381
  if(conn->handler && conn->handler->do_it) {
4382
    /* generic protocol-specific function pointer set in curl_connect() */
4382
    /* generic protocol-specific function pointer set in curl_connect() */
4383
    result = conn->handler->do_it(conn, done);
4383
    result = conn->handler->do_it(conn, done);
4384
4384
Lines 4441-4447 Link Here
4441
{
4441
{
4442
  CURLcode result=CURLE_OK;
4442
  CURLcode result=CURLE_OK;
4443
4443
4444
  if(conn->handler->do_more)
4444
  if(conn->handler && conn->handler->do_more)
4445
    result = conn->handler->do_more(conn);
4445
    result = conn->handler->do_more(conn);
4446
4446
4447
  return result;
4447
  return result;

Return to bug 198931