AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-4271 Fix and test fgets buffer overrun.

Browse Source 
X-SVN-Rev: 18064
This commit is contained in:
George Rhoten 2005-06-27 06:47:17 +00:00
parent 0df92dfa17
commit f4cc6ad24c
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icu4c/source/io/ustdio.c
View File

@ -503,11 +503,11 @@ u_fgets(UChar *s,
alias = str->fPos;
/* Find how much to copy */
if (dataSize < n) {
if (dataSize < (n - count)) {
limit = str->fLimit;
}
else {
limit = alias + n;
limit = alias + (n - count);
}
if (!currDelim) {

42
icu4c/source/test/iotest/filetst.c
View File

@ -739,8 +739,6 @@ static void TestLineCount(const char *prefixLine, const char *line, int32_t numR
u_uastrncpy(expectedBuffer, line, (int32_t)strlen(line)+1);
for (repetitions = 0; ; repetitions++) {
UChar *returnedUCharBuffer;
u_memset(buffer, 0xBEEF, sizeof(buffer)/sizeof(buffer[0]));
returnedUCharBuffer = u_fgets(buffer, sizeof(buffer)/sizeof(buffer[0]), myFile);
@ -771,6 +769,45 @@ static void TestfgetsNewLineCount(void) {
TestLineCount("\n", "\r\n", 1024); /* a mixed number of lines. */
}
static void TestFgetsLineBuffering(void) {
UChar buffer[2003]; /* Use a non-power of 2 or 10 */
UChar *returnedUCharBuffer;
int32_t repetitions;
UFILE *myFile = NULL;
FILE *stdFile = fopen(STANDARD_TEST_FILE, "wb");
if (stdFile == NULL) {
log_err("Can't write test file.\n");
return;
}
u_memset(buffer, 0xBEEF, sizeof(buffer)/sizeof(buffer[0]));
/* Write one very long line */
for (repetitions = 0; repetitions < ((sizeof(buffer)/sizeof(buffer[0]))*2); repetitions++) {
fwrite(repetitions ? "1" : "2", 1, 1, stdFile);
}
fclose(stdFile);
myFile = u_fopen(STANDARD_TEST_FILE, "rb", NULL, NULL);
if (myFile == NULL) {
log_err("Can't read test file.\n");
return;
}
/* Read part of one very long line */
returnedUCharBuffer = u_fgets(buffer, (sizeof(buffer)/sizeof(buffer[0]))-1, myFile);
if (u_strlen(returnedUCharBuffer) != ((sizeof(buffer)/sizeof(buffer[0]))-2)) {
log_err("Line is wrong length. Got %d. Expected %d.\n",
u_strlen(returnedUCharBuffer), ((sizeof(buffer)/sizeof(buffer[0]))-2));
}
/* We better not read too much */
if (buffer[(sizeof(buffer)/sizeof(buffer[0]))-1] != 0xBEEF) {
log_err("Too much data was written\n");
}
u_fclose(myFile);
}
static void TestCodepage(void) {
UFILE *myFile = NULL;
@ -1361,6 +1398,7 @@ addFileTest(TestNode** root) {
addTest(root, &TestfgetsLineCount, "file/TestfgetsLineCount");
addTest(root, &TestfgetsNewLineHandling, "file/TestfgetsNewLineHandling");
addTest(root, &TestfgetsNewLineCount, "file/TestfgetsNewLineCount");
addTest(root, &TestFgetsLineBuffering, "file/TestFgetsLineBuffering");
addTest(root, &TestCodepage, "file/TestCodepage");
#if !UCONFIG_NO_FORMATTING
addTest(root, &TestCodepageAndLocale, "file/TestCodepageAndLocale");