summaryrefslogtreecommitdiffstats
path: root/comphelper/source/misc
diff options
context:
space:
mode:
Diffstat (limited to 'comphelper/source/misc')
-rw-r--r--comphelper/source/misc/configuration.cxx107
-rw-r--r--comphelper/source/misc/docpasswordhelper.cxx5
-rw-r--r--comphelper/source/misc/storagehelper.cxx6
3 files changed, 37 insertions, 81 deletions
diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx
index 6e500f6192..a724b86545 100644
--- a/comphelper/source/misc/configuration.cxx
+++ b/comphelper/source/misc/configuration.cxx
@@ -10,8 +10,11 @@
#include <sal/config.h>
#include <cassert>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <string_view>
-#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/configuration/ReadOnlyAccess.hpp>
#include <com/sun/star/configuration/ReadWriteAccess.hpp>
@@ -21,16 +24,12 @@
#include <com/sun/star/container/XHierarchicalNameReplace.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/util/XChangesListener.hpp>
-#include <com/sun/star/util/XChangesNotifier.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XLocalizable.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <comphelper/solarmutex.hxx>
#include <comphelper/configuration.hxx>
#include <comphelper/configurationlistener.hxx>
-#include <cppuhelper/implbase.hxx>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <i18nlangtag/languagetag.hxx>
@@ -107,67 +106,12 @@ comphelper::detail::ConfigurationWrapper::get()
return WRAPPER;
}
-class comphelper::detail::ConfigurationChangesListener
- : public ::cppu::WeakImplHelper<css::util::XChangesListener>
-{
- comphelper::detail::ConfigurationWrapper& mrConfigurationWrapper;
-public:
- ConfigurationChangesListener(comphelper::detail::ConfigurationWrapper& rWrapper)
- : mrConfigurationWrapper(rWrapper)
- {}
- // util::XChangesListener
- virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& ) override
- {
- std::scoped_lock aGuard(mrConfigurationWrapper.maMutex);
- mrConfigurationWrapper.maPropertyCache.clear();
- }
- virtual void SAL_CALL disposing(const css::lang::EventObject&) override
- {
- std::scoped_lock aGuard(mrConfigurationWrapper.maMutex);
- mrConfigurationWrapper.mbDisposed = true;
- mrConfigurationWrapper.maPropertyCache.clear();
- mrConfigurationWrapper.maNotifier.clear();
- mrConfigurationWrapper.maListener.clear();
- }
-};
-
comphelper::detail::ConfigurationWrapper::ConfigurationWrapper():
context_(comphelper::getProcessComponentContext()),
- access_(css::configuration::ReadWriteAccess::create(context_, "*")),
- mbDisposed(false)
-{
- // Set up a configuration notifier to invalidate the cache as needed.
- try
- {
- css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider(
- css::configuration::theDefaultProvider::get( context_ ) );
-
- // set root path
- css::uno::Sequence< css::uno::Any > params {
- css::uno::Any( css::beans::NamedValue{ "nodepath", css::uno::Any( OUString("/"))} ),
- css::uno::Any( css::beans::NamedValue{ "locale", css::uno::Any( OUString("*"))} ) };
-
- css::uno::Reference< css::uno::XInterface > xCfg
- = xConfigProvider->createInstanceWithArguments(u"com.sun.star.configuration.ConfigurationAccess"_ustr,
- params);
-
- maNotifier = css::uno::Reference< css::util::XChangesNotifier >(xCfg, css::uno::UNO_QUERY);
- assert(maNotifier.is());
- maListener.set(new ConfigurationChangesListener(*this));
- maNotifier->addChangesListener(maListener);
- }
- catch(const css::uno::Exception&)
- {
- assert(false);
- }
-}
+ access_(css::configuration::ReadWriteAccess::create(context_, "*"))
+{}
-comphelper::detail::ConfigurationWrapper::~ConfigurationWrapper()
-{
- maPropertyCache.clear();
- maNotifier.clear();
- maListener.clear();
-}
+comphelper::detail::ConfigurationWrapper::~ConfigurationWrapper() {}
bool comphelper::detail::ConfigurationWrapper::isReadOnly(OUString const & path)
const
@@ -178,26 +122,31 @@ bool comphelper::detail::ConfigurationWrapper::isReadOnly(OUString const & path)
!= 0;
}
-css::uno::Any comphelper::detail::ConfigurationWrapper::getPropertyValue(OUString const& path) const
+css::uno::Any comphelper::detail::ConfigurationWrapper::getPropertyValue(std::u16string_view path) const
{
- std::scoped_lock aGuard(maMutex);
- if (mbDisposed)
- throw css::lang::DisposedException();
// Cache the configuration access, since some of the keys are used in hot code.
- auto it = maPropertyCache.find(path);
- if( it != maPropertyCache.end())
- return it->second;
+ // Note that this cache is only used by the officecfg:: auto-generated code, using it for anything
+ // else would be unwise because the cache could end up containing stale entries.
+ static std::mutex gMutex;
+ static std::map<OUString, css::uno::Reference< css::container::XNameAccess >> gAccessMap;
- sal_Int32 idx = path.lastIndexOf("/");
+ sal_Int32 idx = path.rfind('/');
assert(idx!=-1);
- OUString parentPath = path.copy(0, idx);
- OUString childName = path.copy(idx+1);
-
- css::uno::Reference<css::container::XNameAccess> access(
- access_->getByHierarchicalName(parentPath), css::uno::UNO_QUERY_THROW);
- css::uno::Any property = access->getByName(childName);
- maPropertyCache.emplace(path, property);
- return property;
+ OUString parentPath(path.substr(0, idx));
+ OUString childName(path.substr(idx+1));
+
+ std::scoped_lock aGuard(gMutex);
+
+ // check cache
+ auto it = gAccessMap.find(parentPath);
+ if (it == gAccessMap.end())
+ {
+ // not in the cache, look it up
+ css::uno::Reference<css::container::XNameAccess> access(
+ access_->getByHierarchicalName(parentPath), css::uno::UNO_QUERY_THROW);
+ it = gAccessMap.emplace(parentPath, access).first;
+ }
+ return it->second->getByName(childName);
}
void comphelper::detail::ConfigurationWrapper::setPropertyValue(
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index 0adb6eff9a..1f73bd8d70 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -427,7 +427,10 @@ OUString DocPasswordHelper::GetOoxHashAsBase64(
uno::Sequence< sal_Int8 > aResult( nLength );
rtlRandomPool aRandomPool = rtl_random_createPool ();
- rtl_random_getBytes ( aRandomPool, aResult.getArray(), nLength );
+ if (rtl_random_getBytes(aRandomPool, aResult.getArray(), nLength) != rtl_Random_E_None)
+ {
+ throw uno::RuntimeException("rtl_random_getBytes failed");
+ }
rtl_random_destroyPool ( aRandomPool );
return aResult;
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index 9d3dbcd227..1d504cb917 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -390,6 +390,7 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData(
catch ( uno::Exception& )
{
TOOLS_WARN_EXCEPTION("comphelper", "Can not create SHA256 digest!" );
+ throw; // tdf#159519 DO NOT RETURN SUCCESS
}
// MS_1252 encoding was used for SO60 document format password encoding,
@@ -446,7 +447,10 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreateGpgPackageEncryptionDat
// get 32 random chars out of it
uno::Sequence < sal_Int8 > aVector(32);
- rtl_random_getBytes( aRandomPool, aVector.getArray(), aVector.getLength() );
+ if (rtl_random_getBytes(aRandomPool, aVector.getArray(), aVector.getLength()) != rtl_Random_E_None)
+ {
+ throw uno::RuntimeException("rtl_random_getBytes failed");
+ }
rtl_random_destroyPool(aRandomPool);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 00:42:37 +0000