Commit 883338a9 authored by tnurnberg@mysql.com/white.intern.koehntopp.de's avatar tnurnberg@mysql.com/white.intern.koehntopp.de
Browse files

Bug#31752: check strmake() bounds 

strmake() called with wrong parameters:
5.0-specific fixes.
parent f91cf9c7

client/mysql.cc

+4 −1
Original line number Diff line number Diff line
@@ -2987,7 +2987,10 @@ com_connect(String *buffer, char *line) 
      Two null bytes are needed in the end of buff to allow

      get_arg to find end of string the second time it's called.

    */

    strmake(buff, line, sizeof(buff)-2);

    tmp= strmake(buff, line, sizeof(buff)-2);

#ifdef EXTRA_DEBUG

    tmp[1]= 0;

#endif

    tmp= get_arg(buff, 0);

    if (tmp && *tmp)

    {

sql/sp.cc

+1 −1
Original line number Diff line number Diff line
@@ -1902,7 +1902,7 @@ sp_use_new_db(THD *thd, LEX_STRING new_db, LEX_STRING *old_db, 


  if (thd->db)

  {

    old_db->length= (strmake(old_db->str, thd->db, old_db->length) -

    old_db->length= (strmake(old_db->str, thd->db, old_db->length - 1) -

                     old_db->str);

  }

  else