commit d1c0a77ed1ba96b29e9b260b9ea1696634a9a094
author Stephan Bergmann <sbergman@redhat.com> Mon Jul 11 17:26:59 2016 +0200
committer Stephan Bergmann <sbergman@redhat.com> Mon Jul 11 17:27:23 2016 +0200
tree 43aa14bb87e73065e3fafe4fcda332c4094d7bf1
parent 19694ee33b6605e0b881392ad98eeec164ea770c

getFactory only called with nullptr "key" argument

Change-Id: I5148e1902cb3c1d2bb87b623dfd843ccadf6c430

cppuhelper/source/shlib.cxx

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 7e334e7..0cffab6 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -105,9 +105,8 @@ extern "C" void getFactory(va_list * args) {
    component_getFactoryFunc fn = va_arg(*args, component_getFactoryFunc);
    rtl::OString const * implementation = va_arg(*args, rtl::OString const *);
    void * smgr = va_arg(*args, void *);
    void * key = va_arg(*args, void *);
    void ** factory = va_arg(*args, void **);
    *factory = (*fn)(implementation->getStr(), smgr, key);
    *factory = (*fn)(implementation->getStr(), smgr, nullptr);
}

css::uno::Reference<css::uno::XInterface> invokeComponentFactory(
@@ -140,7 +139,7 @@ css::uno::Reference<css::uno::XInterface> invokeComponentFactory(
            serviceManager.get(),
            cppu::UnoType<css::lang::XMultiServiceFactory>::get());
        void * factory = nullptr;
        target.invoke(getFactory, function, &impl, smgr, 0, &factory);
        target.invoke(getFactory, function, &impl, smgr, &factory);
        if (smgr != nullptr) {
            (*target.get()->pExtEnv->releaseInterface)(
                target.get()->pExtEnv, smgr);