Re: [libvirt] [PATCH 11/23] Fix leak of iterators in virDBusMessageIterEncode

On Wed, Sep 25, 2013 at 10:45:00AM -0600, Eric Blake wrote: > On 09/25/2013 08:51 AM, Daniel P. Berrange wrote: >> From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; >> >> If virDBusMessageIterEncode hits an OOM condition it often >> leaks the memory associated with the dbus iterator object >> >> Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; >> --- > >> >> cleanup: >> + while (nstack > 0) { >> + DBusMessageIter *thisiter = iter; >> + VIR_DEBUG("Popping iter=%p", iter); >> + if (virDBusTypeStackPop(&stack, &nstack, &iter, >> + &types, &nstruct, &narray) < 0) >> + goto cleanup; > > I'm worried that this will infloop. What guarantee do we have that > nstack reduces when virDBusTypeStackPop fails? It can only return -1, if nstack == 0, so I think we're fine there