| Index: chrome/third_party/hunspell/src/hunspell/dictmgr.cxx
|
| ===================================================================
|
| --- chrome/third_party/hunspell/src/hunspell/dictmgr.cxx (revision 21721)
|
| +++ chrome/third_party/hunspell/src/hunspell/dictmgr.cxx (working copy)
|
| @@ -135,15 +135,19 @@
|
| *stringp = dp+1;
|
| int nc = (int)((unsigned long)dp - (unsigned long)mp);
|
| rv = (char *) malloc(nc+1);
|
| - memcpy(rv,mp,nc);
|
| - *(rv+nc) = '\0';
|
| - return rv;
|
| + if (rv) {
|
| + memcpy(rv,mp,nc);
|
| + *(rv+nc) = '\0';
|
| + return rv;
|
| + }
|
| } else {
|
| rv = (char *) malloc(n+1);
|
| - memcpy(rv, mp, n);
|
| - *(rv+n) = '\0';
|
| - *stringp = mp + n;
|
| - return rv;
|
| + if (rv) {
|
| + memcpy(rv, mp, n);
|
| + *(rv+n) = '\0';
|
| + *stringp = mp + n;
|
| + return rv;
|
| + }
|
| }
|
| }
|
| return NULL;
|
|
|
| Property changes on: chrome\third_party\hunspell\src\hunspell\dictmgr.cxx
|
| ___________________________________________________________________
|
| Added: svn:eol-style
|
| + LF
|
|
|
|
|