~ubuntu-branches/ubuntu/natty/mysql-5.1/natty-proposed

« back to all changes in this revision

Viewing changes to storage/innodb_plugin/ut/ut0mem.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 08:30:45 UTC
  • mfrom: (1.4.1)
  • Revision ID: package-import@ubuntu.com-20120222083045-2rd53r4bnyx7qus4
Tags: 5.1.61-0ubuntu0.11.04.1
* 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 1994, 2009, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1994, 2011, Oracle and/or its affiliates. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
489
489
        return(src_size);
490
490
}
491
491
 
492
 
/**********************************************************************//**
493
 
Make a quoted copy of a NUL-terminated string.  Leading and trailing
494
 
quotes will not be included; only embedded quotes will be escaped.
495
 
See also ut_strlenq() and ut_memcpyq().
496
 
@return pointer to end of dest */
497
 
UNIV_INTERN
498
 
char*
499
 
ut_strcpyq(
500
 
/*=======*/
501
 
        char*           dest,   /*!< in: output buffer */
502
 
        char            q,      /*!< in: the quote character */
503
 
        const char*     src)    /*!< in: null-terminated string */
504
 
{
505
 
        while (*src) {
506
 
                if ((*dest++ = *src++) == q) {
507
 
                        *dest++ = q;
508
 
                }
509
 
        }
510
 
 
511
 
        return(dest);
512
 
}
513
 
 
514
 
/**********************************************************************//**
515
 
Make a quoted copy of a fixed-length string.  Leading and trailing
516
 
quotes will not be included; only embedded quotes will be escaped.
517
 
See also ut_strlenq() and ut_strcpyq().
518
 
@return pointer to end of dest */
519
 
UNIV_INTERN
520
 
char*
521
 
ut_memcpyq(
522
 
/*=======*/
523
 
        char*           dest,   /*!< in: output buffer */
524
 
        char            q,      /*!< in: the quote character */
525
 
        const char*     src,    /*!< in: string to be quoted */
526
 
        ulint           len)    /*!< in: length of src */
527
 
{
528
 
        const char*     srcend = src + len;
529
 
 
530
 
        while (src < srcend) {
531
 
                if ((*dest++ = *src++) == q) {
532
 
                        *dest++ = q;
533
 
                }
534
 
        }
535
 
 
536
 
        return(dest);
537
 
}
538
 
 
539
492
#ifndef UNIV_HOTBACKUP
540
493
/**********************************************************************//**
541
494
Return the number of times s2 occurs in s1. Overlapping instances of s2