Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Unified Diff: google.patch

Issue 300233002: [hunspell] Fix read from uninit memory. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/hunspell.git@master
Patch Set: Fix nit. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « README.chromium ('k') | src/hunspell/suggestmgr.cxx » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: google.patch
diff --git a/google.patch b/google.patch
index 8cd89120ecd8376a7c86a48dd62746eece7a0c0d..0134ce144b949ab92435d602a46353d4ebc90907 100644
--- a/google.patch
+++ b/google.patch
@@ -4,7 +4,7 @@ RCS file: /cvsroot/hunspell/hunspell/src/hunspell/affixmgr.cxx,v
retrieving revision 1.41
diff -u -r1.41 affixmgr.cxx
--- src/hunspell/affixmgr.cxx 16 Dec 2011 09:15:34 -0000 1.41
-+++ src/hunspell/affixmgr.cxx 11 Mar 2014 17:47:58 -0000
++++ src/hunspell/affixmgr.cxx 29 May 2014 01:05:07 -0000
@@ -14,8 +14,14 @@
#include "csutil.hxx"
@@ -195,7 +195,7 @@ RCS file: /cvsroot/hunspell/hunspell/src/hunspell/affixmgr.hxx,v
retrieving revision 1.15
diff -u -r1.15 affixmgr.hxx
--- src/hunspell/affixmgr.hxx 13 Oct 2011 13:41:54 -0000 1.15
-+++ src/hunspell/affixmgr.hxx 11 Mar 2014 17:47:58 -0000
++++ src/hunspell/affixmgr.hxx 29 May 2014 01:05:07 -0000
@@ -18,6 +18,40 @@
class PfxEntry;
class SfxEntry;
@@ -280,7 +280,7 @@ RCS file: /cvsroot/hunspell/hunspell/src/hunspell/filemgr.cxx,v
retrieving revision 1.5
diff -u -r1.5 filemgr.cxx
--- src/hunspell/filemgr.cxx 23 Jun 2011 09:21:50 -0000 1.5
-+++ src/hunspell/filemgr.cxx 11 Mar 2014 17:47:58 -0000
++++ src/hunspell/filemgr.cxx 29 May 2014 01:05:07 -0000
@@ -7,6 +7,32 @@
#include "filemgr.hxx"
@@ -325,7 +325,7 @@ RCS file: /cvsroot/hunspell/hunspell/src/hunspell/filemgr.hxx,v
retrieving revision 1.3
diff -u -r1.3 filemgr.hxx
--- src/hunspell/filemgr.hxx 15 Apr 2010 11:22:08 -0000 1.3
-+++ src/hunspell/filemgr.hxx 11 Mar 2014 17:47:58 -0000
++++ src/hunspell/filemgr.hxx 29 May 2014 01:05:07 -0000
@@ -7,6 +7,30 @@
#include "hunzip.hxx"
#include <stdio.h>
@@ -368,7 +368,7 @@ RCS file: /cvsroot/hunspell/hunspell/src/hunspell/hashmgr.cxx,v
retrieving revision 1.12
diff -u -r1.12 hashmgr.cxx
--- src/hunspell/hashmgr.cxx 23 Jun 2011 09:21:50 -0000 1.12
-+++ src/hunspell/hashmgr.cxx 11 Mar 2014 17:47:58 -0000
++++ src/hunspell/hashmgr.cxx 29 May 2014 01:05:07 -0000
@@ -12,8 +12,14 @@
// build a hash table from a munched word list
@@ -738,7 +738,7 @@ RCS file: /cvsroot/hunspell/hunspell/src/hunspell/hashmgr.hxx,v
retrieving revision 1.3
diff -u -r1.3 hashmgr.hxx
--- src/hunspell/hashmgr.hxx 15 Apr 2010 11:22:08 -0000 1.3
-+++ src/hunspell/hashmgr.hxx 11 Mar 2014 17:47:58 -0000
++++ src/hunspell/hashmgr.hxx 29 May 2014 01:05:07 -0000
@@ -8,10 +8,25 @@
#include "htypes.hxx"
#include "filemgr.hxx"
@@ -836,7 +836,7 @@ RCS file: /cvsroot/hunspell/hunspell/src/hunspell/htypes.hxx,v
retrieving revision 1.3
diff -u -r1.3 htypes.hxx
--- src/hunspell/htypes.hxx 6 Sep 2010 07:58:53 -0000 1.3
-+++ src/hunspell/htypes.hxx 11 Mar 2014 17:47:58 -0000
++++ src/hunspell/htypes.hxx 29 May 2014 01:05:07 -0000
@@ -1,6 +1,16 @@
#ifndef _HTYPES_HXX_
#define _HTYPES_HXX_
@@ -860,7 +860,7 @@ RCS file: /cvsroot/hunspell/hunspell/src/hunspell/hunspell.cxx,v
retrieving revision 1.29
diff -u -r1.29 hunspell.cxx
--- src/hunspell/hunspell.cxx 23 Jun 2011 09:21:50 -0000 1.29
-+++ src/hunspell/hunspell.cxx 11 Mar 2014 17:47:58 -0000
++++ src/hunspell/hunspell.cxx 29 May 2014 01:05:07 -0000
@@ -7,20 +7,37 @@
#include "hunspell.hxx"
@@ -1006,7 +1006,7 @@ RCS file: /cvsroot/hunspell/hunspell/src/hunspell/hunspell.hxx,v
retrieving revision 1.6
diff -u -r1.6 hunspell.hxx
--- src/hunspell/hunspell.hxx 21 Jan 2011 17:30:41 -0000 1.6
-+++ src/hunspell/hunspell.hxx 11 Mar 2014 17:47:58 -0000
++++ src/hunspell/hunspell.hxx 29 May 2014 01:05:07 -0000
@@ -5,6 +5,10 @@
#include "suggestmgr.hxx"
#include "langnum.hxx"
@@ -1063,7 +1063,7 @@ RCS file: /cvsroot/hunspell/hunspell/src/hunspell/replist.hxx,v
retrieving revision 1.2
diff -u -r1.2 replist.hxx
--- src/hunspell/replist.hxx 15 Apr 2010 11:22:09 -0000 1.2
-+++ src/hunspell/replist.hxx 11 Mar 2014 17:47:58 -0000
++++ src/hunspell/replist.hxx 29 May 2014 01:05:07 -0000
@@ -2,6 +2,12 @@
#ifndef _REPLIST_HXX_
#define _REPLIST_HXX_
@@ -1083,7 +1083,7 @@ RCS file: /cvsroot/hunspell/hunspell/src/hunspell/suggestmgr.cxx,v
retrieving revision 1.24
diff -u -r1.24 suggestmgr.cxx
--- src/hunspell/suggestmgr.cxx 14 Feb 2011 21:47:24 -0000 1.24
-+++ src/hunspell/suggestmgr.cxx 11 Mar 2014 17:47:58 -0000
++++ src/hunspell/suggestmgr.cxx 29 May 2014 01:05:07 -0000
@@ -12,9 +12,114 @@
const w_char W_VLINE = { '\0', '|' };
@@ -1303,13 +1303,32 @@ diff -u -r1.24 suggestmgr.cxx
lval = sc;
for (j=0; j < MAX_ROOTS; j++)
if (scores[j] < lval) {
+@@ -1948,16 +2108,14 @@
+ m = strlen(s);
+ n = strlen(s2);
+ }
+- c = (char *) malloc((m + 1) * (n + 1));
+- b = (char *) malloc((m + 1) * (n + 1));
++ c = (char *) calloc(m + 1, n + 1);
++ b = (char *) calloc(m + 1, n + 1);
+ if (!c || !b) {
+ if (c) free(c);
+ if (b) free(b);
+ *result = NULL;
+ return;
+ }
+- for (i = 1; i <= m; i++) c[i*(n+1)] = 0;
+- for (j = 0; j <= n; j++) c[j] = 0;
+ for (i = 1; i <= m; i++) {
+ for (j = 1; j <= n; j++) {
+ if ( ((utf8) && (*((short *) su+i-1) == *((short *)su2+j-1)))
Index: src/hunspell/suggestmgr.hxx
===================================================================
RCS file: /cvsroot/hunspell/hunspell/src/hunspell/suggestmgr.hxx,v
retrieving revision 1.5
diff -u -r1.5 suggestmgr.hxx
--- src/hunspell/suggestmgr.hxx 21 Jan 2011 22:10:24 -0000 1.5
-+++ src/hunspell/suggestmgr.hxx 11 Mar 2014 17:47:58 -0000
++++ src/hunspell/suggestmgr.hxx 29 May 2014 01:05:07 -0000
@@ -52,7 +52,11 @@
« no previous file with comments | « README.chromium ('k') | src/hunspell/suggestmgr.cxx » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698