nhyatt/osslsigncode
1
0
Fork 0
mirror of https://github.com/mtrojnar/osslsigncode.git synced 2025-04-04 17:00:11 -05:00
Code Issues Projects Releases Wiki Activity

Fix dereference before null check, CID 1519396

Browse Source
This commit is contained in:
olszomal 2023-01-12 10:52:36 +01:00 committed by Michał Trojnara
parent 61cf89f26f
commit acfece2c26
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
msi.c
View File

@ -635,11 +635,12 @@ static void prehash_metadata(MSI_ENTRY *entry, BIO *hash)
int msi_prehash_dir(MSI_DIRENT *dirent, BIO *hash, int is_root) int msi_prehash_dir(MSI_DIRENT *dirent, BIO *hash, int is_root)
{ {
int i, ret = 0; int i, ret = 0;
STACK_OF(MSI_DIRENT) *children = sk_MSI_DIRENT_dup(dirent->children); STACK_OF(MSI_DIRENT) *children;
if (dirent == NULL) { if (!dirent || !dirent->children) {
goto out; return ret;
} }
children = sk_MSI_DIRENT_dup(dirent->children);
prehash_metadata(dirent->entry, hash); prehash_metadata(dirent->entry, hash);
sk_MSI_DIRENT_set_cmp_func(children, &dirent_cmp_hash); sk_MSI_DIRENT_set_cmp_func(children, &dirent_cmp_hash);
sk_MSI_DIRENT_sort(children); sk_MSI_DIRENT_sort(children);
@ -668,8 +669,12 @@ out:
int msi_hash_dir(MSI_FILE *msi, MSI_DIRENT *dirent, BIO *hash, int is_root) int msi_hash_dir(MSI_FILE *msi, MSI_DIRENT *dirent, BIO *hash, int is_root)
{ {
int i, ret = 0; int i, ret = 0;
STACK_OF(MSI_DIRENT) *children;
STACK_OF(MSI_DIRENT) *children = sk_MSI_DIRENT_dup(dirent->children); if (!dirent || !dirent->children) {
return ret;
}
children = sk_MSI_DIRENT_dup(dirent->children);
sk_MSI_DIRENT_set_cmp_func(children, &dirent_cmp_hash); sk_MSI_DIRENT_set_cmp_func(children, &dirent_cmp_hash);
sk_MSI_DIRENT_sort(children); sk_MSI_DIRENT_sort(children);
@ -1069,8 +1074,12 @@ static int dirents_save(MSI_DIRENT *dirent, BIO *outdata, MSI_OUT *out, uint32_t
{ {
int i, childenNum; int i, childenNum;
char *entry; char *entry;
STACK_OF(MSI_DIRENT) *children = sk_MSI_DIRENT_dup(dirent->children); STACK_OF(MSI_DIRENT) *children;
if (!dirent || !dirent->children) {
return count;
}
children = sk_MSI_DIRENT_dup(dirent->children);
sk_MSI_DIRENT_set_cmp_func(children, &dirent_cmp_tree); sk_MSI_DIRENT_set_cmp_func(children, &dirent_cmp_tree);
sk_MSI_DIRENT_sort(children); sk_MSI_DIRENT_sort(children);
childenNum = sk_MSI_DIRENT_num(children); childenNum = sk_MSI_DIRENT_num(children);