← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mysql-dfsg-5.1/lucid-security

« back to all changes in this revision

Viewing changes to storage/myisam/ft_boolean_search.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 22:33:55 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20120222223355-or06x1euyk8n0ldi
Tags: 5.1.61-0ubuntu0.10.04.1
https://launchpad.net/bugs/937869
* SECURITY UPDATE: Update to 5.1.61 to fix multiple security issues
  (LP: #937869)
  - http://www.oracle.com/technetwork/topics/security/cpujan2012-366304.html
  - CVE-2011-2262
  - CVE-2012-0075
  - CVE-2012-0112
  - CVE-2012-0113
  - CVE-2012-0114
  - CVE-2012-0115
  - CVE-2012-0116
  - CVE-2012-0117
  - CVE-2012-0118
  - CVE-2012-0119
  - CVE-2012-0120
  - CVE-2012-0484
  - CVE-2012-0485
  - CVE-2012-0486
  - CVE-2012-0487
  - CVE-2012-0488
  - CVE-2012-0489
  - CVE-2012-0490
  - CVE-2012-0491
  - CVE-2012-0492
  - CVE-2012-0493
  - CVE-2012-0494
  - CVE-2012-0495
  - CVE-2012-0496
* Dropped patches unnecessary with 5.1.61:
  - debian/patches/90_mysql_safer_strmov.dpatch
  - debian/patches/51_ssl_test_certs.dpatch
  - debian/patches/52_CVE-2009-4030.dpatch
  - debian/patches/53_CVE-2009-4484.dpatch
  - debian/patches/54_CVE-2008-7247.dpatch
  - debian/patches/55_CVE-2010-1621.dpatch
  - debian/patches/56_CVE-2010-1850.dpatch
  - debian/patches/57_CVE-2010-1849.dpatch
  - debian/patches/58_CVE-2010-1848.dpatch
  - debian/patches/59_CVE-2010-1626.dpatch
  - debian/patches/60_CVE-2010-2008.dpatch
  - debian/patches/60_CVE-2010-3677.dpatch
  - debian/patches/60_CVE-2010-3678.dpatch
  - debian/patches/60_CVE-2010-3679.dpatch
  - debian/patches/60_CVE-2010-3680.dpatch
  - debian/patches/60_CVE-2010-3681.dpatch
  - debian/patches/60_CVE-2010-3682.dpatch
  - debian/patches/60_CVE-2010-3683.dpatch
  - debian/patches/60_CVE-2010-3833.dpatch
  - debian/patches/60_CVE-2010-3834.dpatch
  - debian/patches/60_CVE-2010-3835.dpatch
  - debian/patches/60_CVE-2010-3836.dpatch
  - debian/patches/60_CVE-2010-3837.dpatch
  - debian/patches/60_CVE-2010-3838.dpatch
  - debian/patches/60_CVE-2010-3839.dpatch
  - debian/patches/60_CVE-2010-3840.dpatch
  - debian/patches/61_disable_longfilename_test.dpatch
  - debian/patches/62_alter_table_fix.dpatch
  - debian/patches/63_cherrypick-upstream-49479.dpatch
  - debian/patches/10_readline_build_fix.dpatch
* debian/mysql-client-5.1.docs: removed EXCEPTIONS-CLIENT file
* debian/mysql-server-5.1.docs,debian/libmysqlclient16.docs,
  debian/libmysqlclient-dev.docs: removed, no longer necessary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/ft_boolean_search.c
1
 
/* Copyright (C) 2001-2005 MySQL AB
 
1
/*
 
2
   Copyright (c) 2001-2007 MySQL AB, 2008-2010 Sun Microsystems, Inc.
 
3
   Use is subject to license terms.
2
4
 
3
5
   This program is free software; you can redistribute it and/or modify
4
6
   it under the terms of the GNU General Public License as published by
11
13
 
12
14
   You should have received a copy of the GNU General Public License
13
15
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
16
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
17
*/
15
18
 
16
19
/* Written by Sergei A. Golubchik, who has a shared copyright to this code */
17
20
 
358
361
  int subkeys=1;
359
362
  my_bool can_go_down;
360
363
  MI_INFO *info=ftb->info;
361
 
  uint UNINIT_VAR(off), extra=HA_FT_WLEN+info->s->base.rec_reflength;
 
364
  uint UNINIT_VAR(off), extra= HA_FT_WLEN + info->s->rec_reflength;
362
365
  uchar *lastkey_buf=ftbw->word+ftbw->off;
363
366
 
364
367
  if (ftbw->flags & FTB_FLAG_TRUNC)
437
440
        return 0;
438
441
    }
439
442
 
440
 
    /* going up to the first-level tree to continue search there */
 
443
    /*
 
444
      Going up to the first-level tree to continue search there.
 
445
      Only done when performing prefix search.
 
446
 
 
447
      Key buffer data pointer as well as docid[0] may be smaller
 
448
      than values we got while searching first-level tree. Thus
 
449
      they must be restored to original values to avoid dead-loop,
 
450
      when subsequent search for a bigger value eventually ends up
 
451
      in this same second-level tree.
 
452
    */
441
453
    _mi_dpointer(info, (uchar*) (lastkey_buf+HA_FT_WLEN), ftbw->key_root);
 
454
    ftbw->docid[0]= ftbw->key_root;
442
455
    ftbw->key_root=info->s->state.key_root[ftb->keynr];
443
456
    ftbw->keyinfo=info->s->keyinfo+ftb->keynr;
444
457
    ftbw->off=0;
475
488
  int i;
476
489
  FTB_WORD   *ftbw;
477
490
 
478
 
  if ((ftb->state != READY && ftb->state !=INDEX_DONE) ||
479
 
      ftb->keynr == NO_SUCH_KEY)
 
491
  if (ftb->state == UNINITIALIZED || ftb->keynr == NO_SUCH_KEY)
480
492
    return;
481
493
  ftb->state=INDEX_SEARCH;
482
494