Commit 2b2fa04c authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

msi: Always check the return value of msi_string2idW.

parent 2e1eb80c
...@@ -225,10 +225,12 @@ static UINT JOIN_get_column_info( struct tagMSIVIEW *view, ...@@ -225,10 +225,12 @@ static UINT JOIN_get_column_info( struct tagMSIVIEW *view,
static UINT join_find_row( MSIJOINVIEW *jv, MSIRECORD *rec, UINT *row ) static UINT join_find_row( MSIJOINVIEW *jv, MSIRECORD *rec, UINT *row )
{ {
LPCWSTR str; LPCWSTR str;
UINT i, id, data; UINT r, i, id, data;
str = MSI_RecordGetString( rec, 1 ); str = MSI_RecordGetString( rec, 1 );
msi_string2idW( jv->db->strings, str, &id ); r = msi_string2idW( jv->db->strings, str, &id );
if (r != ERROR_SUCCESS)
return r;
for (i = 0; i < jv->rows; i++) for (i = 0; i < jv->rows; i++)
{ {
......
...@@ -334,10 +334,12 @@ static UINT STORAGES_get_column_info(struct tagMSIVIEW *view, UINT n, ...@@ -334,10 +334,12 @@ static UINT STORAGES_get_column_info(struct tagMSIVIEW *view, UINT n,
static UINT storages_find_row(MSISTORAGESVIEW *sv, MSIRECORD *rec, UINT *row) static UINT storages_find_row(MSISTORAGESVIEW *sv, MSIRECORD *rec, UINT *row)
{ {
LPCWSTR str; LPCWSTR str;
UINT i, id, data; UINT r, i, id, data;
str = MSI_RecordGetString(rec, 1); str = MSI_RecordGetString(rec, 1);
msi_string2idW(sv->db->strings, str, &id); r = msi_string2idW(sv->db->strings, str, &id);
if (r != ERROR_SUCCESS)
return r;
for (i = 0; i < sv->num_rows; i++) for (i = 0; i < sv->num_rows; i++)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment