← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mariadb-5.5/vivid-proposed

« back to all changes in this revision

Viewing changes to extra/yassl/src/yassl_int.cpp

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-11-14 21:04:24 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20141114210424-xlyna0ozl11647o5
Tags: 5.5.40-0ubuntu0.14.10.1
https://launchpad.net/bugs/1391676
* SECURITY UPDATE: Update to 5.5.40 to fix security issues (LP: #1391676)
  - CVE-2014-6507
  - CVE-2014-6491
  - CVE-2014-6500
  - CVE-2014-6469
  - CVE-2014-6555
  - CVE-2014-6559
  - CVE-2014-6494
  - CVE-2014-6496
  - CVE-2014-6464
* Add bsdutils as mariadb-server dependency like upstream does in 5.5.40.

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/yassl/src/yassl_int.cpp
1
1
/*
2
 
   Copyright (c) 2005, 2012, Oracle and/or its affiliates
 
2
   Copyright (c) 2005, 2014, Oracle and/or its affiliates
3
3
 
4
4
   This program is free software; you can redistribute it and/or modify
5
5
   it under the terms of the GNU General Public License as published by
2534
2534
    int DeCompress(input_buffer& in, int sz, input_buffer& out)
2535
2535
    {
2536
2536
        byte tmp[LENGTH_SZ];
2537
 
    
2538
 
        in.read(tmp, sizeof(tmp));
 
2537
   
 
2538
        tmp[0] = in[AUTO]; 
 
2539
        tmp[1] = in[AUTO]; 
2539
2540
 
2540
2541
        uint16 len;
2541
2542
        ato16(tmp, len);