← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mariadb-5.5/utopic-security

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-04-17 20:55:22 UTC
  • mfrom: (2.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20140417205522-wof4l36nxhlkn89m
http://bugs.debian.org/745330
* New upstream release, fixing the following security issues:
  * Corresponding MariaDB CVEs for Oracle SPU April 2014 (Closes: #745330)
    - CVE-2014-0384 
    - CVE-2014-2419 
    - CVE-2014-2430 
    - CVE-2014-2431 
    - CVE-2014-2432 
    - CVE-2014-2436 
    - CVE-2014-2438 
    - CVE-2014-2440
* Re-enabled TokuDB with "if arch amd64" in d/rules
* Applied patch to log init output better
  (Closes https://mariadb.atlassian.net/browse/MDEV-5957)

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/yassl/src/crypto_wrapper.cpp
953
953
                    info->set = true;
954
954
                }
955
955
            }
956
 
            // get blank line
957
 
            if (fgets(line,sizeof(line), file) == 0)
958
 
            {
959
 
              /* Impossible case */
960
 
            }
961
956
            begin = ftell(file);
 
957
            if (fgets(line,sizeof(line), file)) // get blank line
 
958
              begin = ftell(file);
962
959
        }
963
960
          
964
961
    }