← Back to branch summary

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

« back to all changes in this revision

Viewing changes to storage/innobase/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
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

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/ut/ut0mem.c
408
408
}
409
409
 
410
410
/**************************************************************************
411
 
Make a quoted copy of a NUL-terminated string.  Leading and trailing
412
 
quotes will not be included; only embedded quotes will be escaped.
413
 
See also ut_strlenq() and ut_memcpyq(). */
414
 
 
415
 
char*
416
 
ut_strcpyq(
417
 
/*=======*/
418
 
                                /* out: pointer to end of dest */
419
 
        char*           dest,   /* in: output buffer */
420
 
        char            q,      /* in: the quote character */
421
 
        const char*     src)    /* in: null-terminated string */
422
 
{
423
 
        while (*src) {
424
 
                if ((*dest++ = *src++) == q) {
425
 
                        *dest++ = q;
426
 
                }
427
 
        }
428
 
 
429
 
        return(dest);
430
 
}
431
 
 
432
 
/**************************************************************************
433
 
Make a quoted copy of a fixed-length string.  Leading and trailing
434
 
quotes will not be included; only embedded quotes will be escaped.
435
 
See also ut_strlenq() and ut_strcpyq(). */
436
 
 
437
 
char*
438
 
ut_memcpyq(
439
 
/*=======*/
440
 
                                /* out: pointer to end of dest */
441
 
        char*           dest,   /* in: output buffer */
442
 
        char            q,      /* in: the quote character */
443
 
        const char*     src,    /* in: string to be quoted */
444
 
        ulint           len)    /* in: length of src */
445
 
{
446
 
        const char*     srcend = src + len;
447
 
 
448
 
        while (src < srcend) {
449
 
                if ((*dest++ = *src++) == q) {
450
 
                        *dest++ = q;
451
 
                }
452
 
        }
453
 
 
454
 
        return(dest);
455
 
}
456
 
 
457
 
/**************************************************************************
458
411
Return the number of times s2 occurs in s1. Overlapping instances of s2
459
412
are only counted once. */
460
413