← Back to branch summary

~linuxjedi/libdrizzle/5.1-docs2

« back to all changes in this revision

Viewing changes to libdrizzle/handshake.cc

  • Committer: Continuous Integration
  • Date: 2013-01-13 20:18:49 UTC
  • mfrom: (90.1.4 5.1-malloc-replace)
  • Revision ID: ci@drizzle.org-20130113201849-a0to8usgbnbf5sch
Merge lp:~linuxjedi/libdrizzle/5.1-malloc-replace Build: jenkins-Libdrizzle-46

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/handshake.cc
240
240
                  + 1;  /* NULL */
241
241
 
242
242
  /* Assume the entire handshake packet will fit in the buffer. */
243
 
  if ((con->packet_size + 4) > DRIZZLE_MAX_BUFFER_SIZE)
 
243
  if ((con->packet_size + 4) > con->buffer_allocation)
244
244
  {
245
245
    drizzle_set_error(con, "drizzle_state_handshake_server_write",
246
246
                      "buffer too small:%zu", con->packet_size + 4);
548
548
                  + strlen(con->db) + 1;
549
549
 
550
550
  /* Assume the entire handshake packet will fit in the buffer. */
551
 
  if ((con->packet_size + 4) > DRIZZLE_MAX_BUFFER_SIZE)
 
551
  if ((con->packet_size + 4) > con->buffer_allocation)
552
552
  {
553
553
    drizzle_set_error(con, "drizzle_state_handshake_client_write",
554
554
                      "buffer too small:%zu", con->packet_size + 4);