Skip to content

W
wine-winehq
Commit 0d4e1bc3 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

widl: Fix a SEGV when using arrays declared using a pointer and

attributes, instead of array indices (reported by Eric Kohl).
parent ebc65aea
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
tools/widl/typegen.c
View file @ 0d4e1bc3
......@@ -639,7 +639,7 @@ static size_t write_array_tfs(FILE *file, const attr_t *attrs,
/* FIXME: need to analyse type for pointers */
if (NEXT_LINK(array)) /* multi-dimensional array */
if (array && NEXT_LINK(array)) /* multi-dimensional array */
{
error("write_array_tfs: Multi-dimensional arrays not implemented yet (param %s)\n", name);
return 0;
......@@ -1170,7 +1170,7 @@ void marshall_arguments(FILE *file, int indent, func_t *func,
int has_length = length_is && (length_is->type != EXPR_VOID);
int has_size = (size_is && (size_is->type != EXPR_VOID)) || !var->array->is_const;
if (NEXT_LINK(var->array)) /* multi-dimensional array */
if (var->array && NEXT_LINK(var->array)) /* multi-dimensional array */
array_type = "ComplexArray";
else
{
......@@ -1364,7 +1364,7 @@ void unmarshall_arguments(FILE *file, int indent, func_t *func,
int has_length = length_is && (length_is->type != EXPR_VOID);
int has_size = (size_is && (size_is->type != EXPR_VOID)) || !var->array->is_const;
if (NEXT_LINK(var->array)) /* multi-dimensional array */
if (var->array && NEXT_LINK(var->array)) /* multi-dimensional array */
array_type = "ComplexArray";
else
{
......
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