diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 12:47:39 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 12:47:39 +0000 |
| commit | cb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch) | |
| tree | 8b4e9e320258d5280ce454163c49363030626c1a /libX11/src/xlibi18n/lcDB.c | |
| parent | 213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff) | |
| parent | c87efef42f76c2ff0dcfad2842ab369beffd21de (diff) | |
| download | vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2 vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/src/xlibi18n/lcDB.c')
| -rw-r--r-- | libX11/src/xlibi18n/lcDB.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libX11/src/xlibi18n/lcDB.c b/libX11/src/xlibi18n/lcDB.c index 23da4f64e..31ef9b800 100644 --- a/libX11/src/xlibi18n/lcDB.c +++ b/libX11/src/xlibi18n/lcDB.c @@ -14,7 +14,7 @@ * software without specific, written prior permission. * * IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING - * ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS, AND + * ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS, AND * NONINFRINGEMENT OF THIRD PARTY RIGHTS, IN NO EVENT SHALL * IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, @@ -64,10 +64,6 @@ #define BUFSIZE 6144 /* 2048*3 */ #endif -#ifdef _MSC_VER -typedef long ssize_t; -#endif - #include <stdio.h> typedef struct _DatabaseRec { @@ -555,7 +551,7 @@ append_value_list (void) return 0; } -static int +static int construct_name( char *name, int size) @@ -840,7 +836,7 @@ f_double_quote( len = get_quoted_word(str, wordp); if (len < 1) goto err; - if ((parse_info.bufsize + (int)strlen(wordp) + 1) + if ((parse_info.bufsize + (int)strlen(wordp) + 1) >= parse_info.bufMaxSize) { if (realloc_parse_info(strlen(wordp)+1) == False) { goto err; @@ -902,7 +898,7 @@ f_numeric( len = get_word(p, wordp); if (len < 1) goto err; - if ((parse_info.bufsize + token_len + (int)strlen(wordp) + 1) + if ((parse_info.bufsize + token_len + (int)strlen(wordp) + 1) >= parse_info.bufMaxSize) { if (realloc_parse_info(token_len + strlen(wordp) + 1) == False) goto err; @@ -979,7 +975,7 @@ f_default( break; case S_NAME: case S_VALUE: - if ((parse_info.bufsize + (int)strlen(wordp) + 1) + if ((parse_info.bufsize + (int)strlen(wordp) + 1) >= parse_info.bufMaxSize) { if (realloc_parse_info(strlen(wordp) + 1) == False) goto err; |