Commit 870059eb authored by unknown's avatar unknown
Browse files

myisam/ft_parser.c 

    protection against invalid string in ft_get_word
mysys/my_symlink2.c
    typo fixed


myisam/ft_parser.c:
  protection against invalid string in ft_get_word
mysys/my_symlink2.c:
  typo fixed
parent a53fdc5e

myisam/ft_parser.c

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end, 
                 FT_WORD *word, FTB_PARAM *param)

{

  byte *doc=*start;

  uint mwc, length;

  uint mwc, length, mbl;



  param->yesno=(FTB_YES==' ') ? 1 : (param->quot != 0);

  param->plusminus=param->pmsign=0;
@@ -144,7 +144,7 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end, 
    }



    mwc=length=0;

    for (word->pos=doc; doc<end; length++, doc+=my_mbcharlen(cs, *(uchar *)doc))

    for (word->pos=doc; doc<end; length++, mbl=my_mbcharlen(cs, *(uchar *)doc), doc+=(mbl ? mbl : 1))

      if (true_word_char(cs,*doc))

        mwc=0;

      else if (!misc_word_char(*doc) || mwc++)

mysys/my_symlink2.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ File my_create_with_symlink(const char *linkname, const char *filename, 
  else

  {

    if (linkname)

      my_realpath(&abs_linkname, linkname, MYF(0));

      my_realpath(abs_linkname, linkname, MYF(0));

    create_link= (linkname && strcmp(abs_linkname,filename));

  }