Commit 0649433d authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

realloc: use Curl_saferealloc to avoid common mistakes 

Discussed: https://curl.haxx.se/mail/lib-2016-11/0087.html
parent cdfda3ee

lib/content_encoding.c

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

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

 *

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

 * Copyright (C) 1998 - 2016, 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
@@ -28,8 +28,8 @@ 
#include <curl/curl.h>

#include "sendf.h"

#include "content_encoding.h"

#include "strdup.h"

#include "curl_memory.h"



#include "memdebug.h"



/* Comment this out if zlib is always going to be at least ver. 1.2.0.4
@@ -371,12 +371,9 @@ Curl_unencode_gzip_write(struct connectdata *conn, 
  {

    /* Need more gzip header data state */

    ssize_t hlen;

    unsigned char *oldblock = z->next_in;



    z->avail_in += (uInt)nread;

    z->next_in = realloc(z->next_in, z->avail_in);

    z->next_in = Curl_saferealloc(z->next_in, z->avail_in);

    if(z->next_in == NULL) {

      free(oldblock);

      return exit_zlib(z, &k->zlib_init, CURLE_OUT_OF_MEMORY);

    }

    /* Append the new block of data to the previous one */

lib/curl_ntlm_wb.c

+4 −4
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include "curl_ntlm_wb.h"

#include "url.h"

#include "strerror.h"

#include "strdup.h"

/* The last 3 #include files should be in this order */

#include "curl_printf.h"

#include "curl_memory.h"
@@ -293,11 +294,10 @@ static CURLcode ntlm_wb_response(struct connectdata *conn, 
      buf[len_out - 1] = '\0';

      break;

    }

    newbuf = realloc(buf, len_out + NTLM_BUFSIZE);

    if(!newbuf) {

      free(buf);

    newbuf = Curl_saferealloc(buf, len_out + NTLM_BUFSIZE);

    if(!newbuf)

      return CURLE_OUT_OF_MEMORY;

    }



    buf = newbuf;

  }

lib/escape.c

+3 −4
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "warnless.h"

#include "non-ascii.h"

#include "escape.h"

#include "strdup.h"

/* The last 3 #include files should be in this order */

#include "curl_printf.h"

#include "curl_memory.h"
@@ -109,11 +110,9 @@ char *curl_easy_escape(struct Curl_easy *data, const char *string, 
      newlen += 2; /* the size grows with two, since this'll become a %XX */

      if(newlen > alloc) {

        alloc *= 2;

        testing_ptr = realloc(ns, alloc);

        if(!testing_ptr) {

          free(ns);

        testing_ptr = Curl_saferealloc(ns, alloc);

        if(!testing_ptr)

          return NULL;

        }

        else {

          ns = testing_ptr;

        }

lib/http.c

+2 −2
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
#include "pipeline.h"

#include "http2.h"

#include "connect.h"

#include "strdup.h"



/* The last 3 #include files should be in this order */

#include "curl_printf.h"
@@ -1255,14 +1256,13 @@ CURLcode Curl_add_buffer(Curl_send_buffer *in, const void *inptr, size_t size) 


    if(in->buffer)

      /* we have a buffer, enlarge the existing one */

      new_rb = realloc(in->buffer, new_size);

      new_rb = Curl_saferealloc(in->buffer, new_size);

    else

      /* create a new buffer */

      new_rb = malloc(new_size);



    if(!new_rb) {

      /* If we failed, we cleanup the whole buffer and return error */

      Curl_safefree(in->buffer);

      free(in);

      return CURLE_OUT_OF_MEMORY;

    }

lib/http2.c

+3 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include "url.h"

#include "connect.h"

#include "strtoofft.h"



#include "strdup.h"

/* The last 3 #include files should be in this order */

#include "curl_printf.h"

#include "curl_memory.h"
@@ -841,10 +841,9 @@ static int on_header(nghttp2_session *session, const nghttp2_frame *frame, 
            stream->push_headers_alloc) {

      char **headp;

      stream->push_headers_alloc *= 2;

      headp = realloc(stream->push_headers,

      headp = Curl_saferealloc(stream->push_headers,

                               stream->push_headers_alloc * sizeof(char *));

      if(!headp) {

        free(stream->push_headers);

        stream->push_headers = NULL;

        return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;

      }