Skip to content

W
wine-cw
Commit 3387fc90 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard
Browse files
Options

Fix handling of void.

parent ef847a03
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
tools/widl/write_msft.c
View file @ 3387fc90
...@@ -766,8 +766,11 @@ static int encode_type( ...@@ -766,8 +766,11 @@ static int encode_type(
{ {
int next_vt; int next_vt;
while((next_vt = get_type_vt(type->ref)) == 0) { while((next_vt = get_type_vt(type->ref)) == 0) {
if(type->ref == NULL) {
next_vt = VT_VOID;
break;
}
type = type->ref; type = type->ref;
if(!type) error("encode_type: type->ref is null\n");
} }
encode_type(typelib, next_vt, type->ref, &target_type, NULL, NULL, &child_size); encode_type(typelib, next_vt, type->ref, &target_type, NULL, NULL, &child_size);
...@@ -1021,8 +1024,11 @@ static int encode_var( ...@@ -1021,8 +1024,11 @@ static int encode_var(
vt = get_var_vt(var); vt = get_var_vt(var);
type = var->type; type = var->type;
while(!vt) { while(!vt) {
if(type->ref == NULL) {
vt = VT_VOID;
break;
}
type = type->ref; type = type->ref;
if(!type) error("encode_var: type->ref is null\n");
vt = get_type_vt(type); vt = get_type_vt(type);
} }
encode_type(typelib, vt, type, encoded_type, width, alignment, decoded_size); encode_type(typelib, vt, type, encoded_type, width, alignment, decoded_size);
......
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