← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mysql-5.5/quantal-security

« back to all changes in this revision

Viewing changes to strings/ctype-bin.c

  • Committer: Package Import Robot
  • Author(s): Seth Arnold
  • Date: 2013-04-18 18:15:39 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20130418181539-7uo1w041b4h2ulbs
Tags: 5.5.31-0ubuntu0.12.10.1
https://launchpad.net/bugs/1170516
* SECURITY UPDATE: Update to 5.5.31 to fix security issues (LP: #1170516)
  - http://www.oracle.com/technetwork/topics/security/cpuapr2013-1899555.html
* debian/patches/71_disable_rpl_tests.patch: refreshed.
* debian/patches/fix-mysqldump-test.patch: removed, fixed differently
  upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
strings/ctype-bin.c
318
318
#define INC_PTR(cs,A,B) (A)++
319
319
 
320
320
 
321
 
int my_wildcmp_bin(CHARSET_INFO *cs,
322
 
                   const char *str,const char *str_end,
323
 
                   const char *wildstr,const char *wildend,
324
 
                   int escape, int w_one, int w_many)
 
321
static
 
322
int my_wildcmp_bin_impl(CHARSET_INFO *cs,
 
323
                        const char *str,const char *str_end,
 
324
                        const char *wildstr,const char *wildend,
 
325
                        int escape, int w_one, int w_many, int recurse_level)
325
326
{
326
327
  int result= -1;                       /* Not found, using wildcards */
327
 
  
 
328
 
 
329
  if (my_string_stack_guard && my_string_stack_guard(recurse_level))
 
330
    return 1;
328
331
  while (wildstr != wildend)
329
332
  {
330
333
    while (*wildstr != w_many && *wildstr != w_one)
383
386
        if (str++ == str_end)
384
387
          return(-1);
385
388
        {
386
 
          int tmp=my_wildcmp_bin(cs,str,str_end,wildstr,wildend,escape,w_one,
387
 
                                 w_many);
 
389
          int tmp=my_wildcmp_bin_impl(cs,str,str_end,wildstr,wildend,escape,w_one,
 
390
                                      w_many, recurse_level + 1);
388
391
          if (tmp <= 0)
389
392
            return(tmp);
390
393
        }
395
398
  return(str != str_end ? 1 : 0);
396
399
}
397
400
 
 
401
int my_wildcmp_bin(CHARSET_INFO *cs,
 
402
                   const char *str,const char *str_end,
 
403
                   const char *wildstr,const char *wildend,
 
404
                   int escape, int w_one, int w_many)
 
405
{
 
406
  return my_wildcmp_bin_impl(cs, str, str_end,
 
407
                             wildstr, wildend,
 
408
                             escape, w_one, w_many, 1);
 
409
}
 
410
 
398
411
 
399
412
static size_t my_strnxfrm_bin(CHARSET_INFO *cs __attribute__((unused)),
400
413
                              uchar *dest, size_t dstlen,