incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1363399 - /incubator/ooo/trunk/main/mythes/mythes-1.2.0-overflow.patch
Date Thu, 19 Jul 2012 15:58:52 GMT
Author: alg
Date: Thu Jul 19 15:58:51 2012
New Revision: 1363399

URL: http://svn.apache.org/viewvc?rev=1363399&view=rev
Log:
mythes: fix some warnings
Patch by: Michael Stahl

Added:
    incubator/ooo/trunk/main/mythes/mythes-1.2.0-overflow.patch

Added: incubator/ooo/trunk/main/mythes/mythes-1.2.0-overflow.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/mythes/mythes-1.2.0-overflow.patch?rev=1363399&view=auto
==============================================================================
--- incubator/ooo/trunk/main/mythes/mythes-1.2.0-overflow.patch (added)
+++ incubator/ooo/trunk/main/mythes/mythes-1.2.0-overflow.patch Thu Jul 19 15:58:51 2012
@@ -0,0 +1,24 @@
+--- misc/mythes-1.2.0/mythes.cxx	2010-02-27 16:52:52.000000000 +0100
++++ misc/build/mythes-1.2.0/mythes.cxx	2011-05-18 16:22:49.125014204 +0200
+@@ -4,6 +4,8 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ 
++#include <limits>
++
+ #include "mythes.hxx"
+ 
+ // some basic utility routines
+@@ -204,6 +206,12 @@
+          return 0;
+     }          
+     int nmeanings = atoi(buf+np+1);
++    if ((nmeanings < 0) ||
++        ((::std::numeric_limits<size_t>::max() / sizeof(mentry)) < nmeanings))
++    {
++        free(buf);
++        return 0;
++    }
+     *pme = (mentry*) malloc( nmeanings * sizeof(mentry) );
+     if (!(*pme)) {
+         free(buf);



Mime
View raw message