Juan Lang : msi: Fix possible crash bugs in error path.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Apr 12 04:52:07 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 37009138034c996ab80e6bc5f48e3b453d7b8076
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=37009138034c996ab80e6bc5f48e3b453d7b8076
Author: Juan Lang <juan_lang at yahoo.com>
Date: Tue Apr 11 09:10:33 2006 -0700
msi: Fix possible crash bugs in error path.
---
dlls/msi/appsearch.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c
index d4de09f..d65bddb 100644
--- a/dlls/msi/appsearch.c
+++ b/dlls/msi/appsearch.c
@@ -158,7 +158,8 @@ static UINT ACTION_AppSearchGetSignature
TRACE("Languages is %s\n", debugstr_w(sig->Languages));
end:
- msiobj_release(&row->hdr);
+ if (row)
+ msiobj_release(&row->hdr);
MSI_ViewClose(view);
msiobj_release(&view->hdr);
}
@@ -220,7 +221,8 @@ static UINT ACTION_AppSearchComponents(M
debugstr_w(guid));
end:
- msiobj_release(&row->hdr);
+ if (row)
+ msiobj_release(&row->hdr);
MSI_ViewClose(view);
msiobj_release(&view->hdr);
}
@@ -393,7 +395,8 @@ end:
msi_free( keyPath);
msi_free( valueName);
- msiobj_release(&row->hdr);
+ if (row)
+ msiobj_release(&row->hdr);
MSI_ViewClose(view);
msiobj_release(&view->hdr);
}
@@ -448,7 +451,8 @@ static UINT ACTION_AppSearchIni(MSIPACKA
msi_free( fileName);
end:
- msiobj_release(&row->hdr);
+ if (row)
+ msiobj_release(&row->hdr);
MSI_ViewClose(view);
msiobj_release(&view->hdr);
}
@@ -872,7 +876,8 @@ static UINT ACTION_AppSearchDr(MSIPACKAG
rc = ACTION_SearchDirectory(package, sig, expanded, depth);
end:
- msiobj_release(&row->hdr);
+ if (row)
+ msiobj_release(&row->hdr);
MSI_ViewClose(view);
msiobj_release(&view->hdr);
}
More information about the wine-cvs
mailing list