Fix broken logic and possible NULL pointer dereference for Bundle XML.
authorDavid Robillard <d@drobilla.net>
Tue, 18 Nov 2014 07:25:02 +0000 (02:25 -0500)
committerDavid Robillard <d@drobilla.net>
Tue, 18 Nov 2014 07:53:28 +0000 (02:53 -0500)
libs/ardour/io.cc

index 2cc213f7975932624527f6ee58cd1c850aa14c01..333b0b1ea05e8bf232c48748ca0ab371326adb75 100644 (file)
@@ -854,6 +854,7 @@ IO::get_port_counts (const XMLNode& node, int version, ChanCount& n, boost::shar
        for (iter = node.children().begin(); iter != node.children().end(); ++iter) {
 
                if ((*iter)->name() == X_("Bundle")) {
+                       prop = (*iter)->property ("name");
                        if ((c = find_possible_bundle (prop->value())) != 0) {
                                n = ChanCount::max (n, c->nchannels());
                                return 0;