← Back to branch summary

~linuxjedi/libdrizzle/5.1-docs2

« back to all changes in this revision

Viewing changes to libdrizzle/conn.cc

  • Committer: Continuous Integration
  • Date: 2013-01-17 11:33:48 UTC
  • mfrom: (93.1.3 5.1-better-realloc)
  • Revision ID: ci@drizzle.org-20130117113348-e3yaws0qbijip8cv
Merge lp:~linuxjedi/libdrizzle/5.1-better-realloc Build: jenkins-Libdrizzle-49

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/conn.cc
1165
1165
        memmove(con->buffer, con->buffer_ptr, con->buffer_size);
1166
1166
      }
1167
1167
      con->buffer_allocation= con->buffer_allocation * 2;
1168
 
      con->buffer= (unsigned char*)realloc(con->buffer, con->buffer_allocation);
 
1168
      unsigned char *realloc_buffer= (unsigned char*)realloc(con->buffer, con->buffer_allocation);
 
1169
      if (realloc_buffer == NULL)
 
1170
      {
 
1171
        drizzle_set_error(con, __func__, "realloc failure");
 
1172
        return DRIZZLE_RETURN_MEMORY;
 
1173
      }
 
1174
      con->buffer= realloc_buffer;
1169
1175
      drizzle_log_debug(con, "buffer resized to: %zu", con->buffer_allocation);
1170
1176
      con->buffer_ptr= con->buffer;
1171
1177
      available_buffer= con->buffer_allocation - con->buffer_size;