← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: Lee Bieber
  • Date: 2010-11-08 01:18:10 UTC
  • mfrom: (1909.5.2 trunk-bug-672074)
  • mto: This revision was merged to the branch mainline in revision 1913.
  • Revision ID: kalebral@gmail.com-20101108011810-jldnkz3tn05oujfn
Merge Andrew - fix bug 653240: drizzle command line client reads copious amounts of data into RAM before sending commands 
Merge Andrew - fix bug 672074: buffer overrun in LineBuffer

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
2319
2319
  {
2320
2320
    *out++='\n';
2321
2321
    uint32_t length=(uint32_t) (out-line);
 
2322
    if ((buffer->length() + length) > opt_max_input_line)
 
2323
    {
 
2324
      status.setExitStatus(1);
 
2325
      put_info(_("Not found a delimiter within max_input_line of input"), INFO_ERROR, 0, 0);
 
2326
      return 1;
 
2327
    }
2322
2328
    if ((!*ml_comment || preserve_comments))
2323
2329
      buffer->append(line, length);
2324
2330
  }