ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Fix an off by one error in MsiRecordGetString.

This commit is contained in:
Mike McCormack 2006-07-26 17:43:57 +09:00 committed by Alexandre Julliard
parent 76baa45a86
commit aff9f4c1ed
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msi/record.c
View File

@ -321,7 +321,7 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec, unsigned int iField,
break; break;
} }
if( *pcchValue < len ) if( *pcchValue <= len )
ret = ERROR_MORE_DATA; ret = ERROR_MORE_DATA;
*pcchValue = len; *pcchValue = len;
@ -389,7 +389,7 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec, unsigned int iField,
break; break;
} }
if( *pcchValue < len ) if( *pcchValue <= len )
ret = ERROR_MORE_DATA; ret = ERROR_MORE_DATA;
*pcchValue = len; *pcchValue = len;

38
dlls/msi/tests/record.c
View File

@ -51,7 +51,9 @@ static void test_msirecord(void)
INT i; INT i;
MSIHANDLE h; MSIHANDLE h;
char buf[10]; char buf[10];
WCHAR bufW[10];
const char str[] = "hello"; const char str[] = "hello";
const WCHAR strW[] = { 'h','e','l','l','o',0};
char filename[MAX_PATH]; char filename[MAX_PATH];
/* check behaviour with an invalid record */ /* check behaviour with an invalid record */
@ -147,6 +149,42 @@ static void test_msirecord(void)
ok(0==strncmp(buf,str,sizeof str-3), "MsiRecordGetString returned the wrong string\n"); ok(0==strncmp(buf,str,sizeof str-3), "MsiRecordGetString returned the wrong string\n");
ok(buf[sizeof str - 3]==0, "string wasn't nul terminated\n"); ok(buf[sizeof str - 3]==0, "string wasn't nul terminated\n");
buf[0]=0;
sz = sizeof str;
r = MsiRecordGetString(h,0,buf,&sz);
ok(r == ERROR_SUCCESS, "wrong error\n");
ok(sz == sizeof str-1, "MsiRecordGetString returned the wrong length\n");
ok(0==strcmp(buf,str), "MsiRecordGetString returned the wrong string\n");
memset(bufW, 0, sizeof bufW);
sz = 5;
r = MsiRecordGetStringW(h,0,bufW,&sz);
ok(r == ERROR_MORE_DATA, "wrong error\n");
ok(sz == 5, "MsiRecordGetString returned the wrong length\n");
ok(0==memcmp(bufW,strW,8), "MsiRecordGetString returned the wrong string\n");
sz = 0;
bufW[0] = 'x';
r = MsiRecordGetStringW(h,0,bufW,&sz);
ok(r == ERROR_MORE_DATA, "wrong error\n");
ok(sz == 5, "MsiRecordGetString returned the wrong length\n");
ok('x'==bufW[0], "MsiRecordGetString returned the wrong string\n");
memset(buf, 0, sizeof buf);
sz = 5;
r = MsiRecordGetStringA(h,0,buf,&sz);
ok(r == ERROR_MORE_DATA, "wrong error\n");
ok(sz == 5, "MsiRecordGetString returned the wrong length\n");
ok(0==memcmp(buf,str,4), "MsiRecordGetString returned the wrong string\n");
sz = 0;
buf[0] = 'x';
r = MsiRecordGetStringA(h,0,buf,&sz);
ok(r == ERROR_MORE_DATA, "wrong error\n");
ok(sz == 5, "MsiRecordGetString returned the wrong length\n");
ok('x'==buf[0], "MsiRecordGetString returned the wrong string\n");
/* same record, check we can wipe all the data */ /* same record, check we can wipe all the data */
r = MsiRecordClearData(h); r = MsiRecordClearData(h);
ok(r == ERROR_SUCCESS, "Failed to clear record\n"); ok(r == ERROR_SUCCESS, "Failed to clear record\n");