Commit 7b58a93a authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

parents 82a96692 eb37c17d

libmysql/libmysql.c

+9 −2
Original line number Diff line number Diff line
@@ -939,7 +939,7 @@ static MYSQL_DATA *read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields, 
      else

      {

	cur->data[field] = to;

        if (to+len > end_to)

        if (len > end_to - to)

        {

          free_rows(result);

          net->last_errno=CR_UNKNOWN_ERROR;
@@ -980,7 +980,7 @@ read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths) 
{

  uint field;

  ulong pkt_len,len;

  uchar *pos,*prev_pos;

  uchar *pos,*prev_pos, *end_pos;



  if ((pkt_len=(uint) net_safe_read(mysql)) == packet_error)

    return -1;
@@ -988,6 +988,7 @@ read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths) 
    return 1;				/* End of data */

  prev_pos= 0;				/* allowed to write at packet[-1] */

  pos=mysql->net.read_pos;

  end_pos=pos+pkt_len;

  for (field=0 ; field < fields ; field++)

  {

    if ((len=(ulong) net_field_length(&pos)) == NULL_LENGTH)
@@ -997,6 +998,12 @@ read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths) 
    }

    else

    {

      if (len > end_pos - pos)

      {

        mysql->net.last_errno=CR_UNKNOWN_ERROR;

        strmov(mysql->net.last_error,ER(mysql->net.last_errno));

        return -1;

      }

      row[field] = (char*) pos;

      pos+=len;

      *lengths++=len;