summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-08-05 16:10:37 +0200
committerStefan Metzmacher <metze@samba.org>2010-08-08 11:05:19 +0200
commit0a7f749bc80d9846b97cd22cd503473a205aaafd (patch)
tree5f19b466d41665505bfcdb806c66b5fd24345951
parentd6eb42cc619206c280edd732b1b56563a21e8f4d (diff)
downloadsamba-0a7f749bc80d9846b97cd22cd503473a205aaafd.tar.gz
samba-0a7f749bc80d9846b97cd22cd503473a205aaafd.tar.bz2
samba-0a7f749bc80d9846b97cd22cd503473a205aaafd.zip
pidl:NDR: correctly handle bracket arrays with 'string'
metze
-rw-r--r--pidl/lib/Parse/Pidl/NDR.pm4
1 files changed, 4 insertions, 0 deletions
diff --git a/pidl/lib/Parse/Pidl/NDR.pm b/pidl/lib/Parse/Pidl/NDR.pm
index c1ac6001da..20f52bf9d5 100644
--- a/pidl/lib/Parse/Pidl/NDR.pm
+++ b/pidl/lib/Parse/Pidl/NDR.pm
@@ -125,6 +125,10 @@ sub GetElementLevelTable($$)
if ($d eq "*") {
$is_conformant = 1;
if ($size = shift @size_is) {
+ if (has_property($e, "string")) {
+ $is_string = 1;
+ delete($e->{PROPERTIES}->{string});
+ }
} elsif ((scalar(@size_is) == 0) and has_property($e, "string")) {
$is_string = 1;
delete($e->{PROPERTIES}->{string});