Merge branch 'master' of https://github.com/Sambruk/EgilSCIM

Sambruk · Mar 14, 2024 · 0b6cd86 · 0b6cd86
2 parents 6aa131f + 48269da
commit 0b6cd86
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Releases
 
+## Unreleased
+#### Bugfixes
+  - In the Windows version a heap corruption problem was fixed in the LDAP code (#211)
+
 ## v2.17.0 (2024-02-27)
 #### Features
   - Built-in support for converting national test activity names to UUIDs (#206)

diff --git a/src/config_file.hpp b/src/config_file.hpp
@@ -57,8 +57,8 @@ class config_file {
         return theconfigfile;
     }
 
-    const char *file_name() {
-        return filename.u8string().c_str();
+    std::string file_name_str() {
+        return filename.u8string();
     }
 
     /**

diff --git a/src/config_file_parser.cpp b/src/config_file_parser.cpp
@@ -269,7 +269,8 @@ int config_parser::rule_comment() {
 
 void config_parser::syntax_error(const std::string &str) {
 	/** Set prefix */
-	simplescim_error_string_set_prefix("%s:%lu:%lu:syntax error", config_file::instance().file_name(),
+	auto config = config_file::instance().file_name_str();
+	simplescim_error_string_set_prefix("%s:%lu:%lu:syntax error", config.c_str(),
 	                                   line, col);
 
 	/** Set message */
@@ -278,7 +279,8 @@ void config_parser::syntax_error(const std::string &str) {
 
 void config_parser::syntax_error_expected(const std::string &str) {
 	/** Set prefix */
-	simplescim_error_string_set_prefix("%s:%lu:%lu:syntax error", config_file::instance().file_name(),
+	auto config = config_file::instance().file_name_str();
+	simplescim_error_string_set_prefix("%s:%lu:%lu:syntax error", config.c_str(),
 	                                   line, col);
 
 	/** Set message */

diff --git a/src/ldap_wrapper.cpp b/src/ldap_wrapper.cpp
@@ -96,7 +96,7 @@ int ldap_search_ext_s_utf8(
         int n = MultiByteToWideChar(CP_UTF8, MB_PRECOMPOSED, attrs[i], (int)strlen(attrs[i]), wattrs[i], buffer_size);
         wattrs[i][n] = 0;
     }
-    wattrs[num_attrs] = nullptr;
+    wattrs.push_back(nullptr);
 
     return ldap_search_ext_sW(ld, base_buffer, scope,
         filter_buffer,

diff --git a/src/load_limiter.cpp b/src/load_limiter.cpp
@@ -112,9 +112,9 @@ std::shared_ptr<load_limiter> get_limiter(const std::string& type) {
     static std::string current_config;
     static std::map<std::string, std::shared_ptr<load_limiter>> limiters;
 
-    if (conf.file_name() != current_config) {
+    if (conf.file_name_str() != current_config) {
         limiters.clear();
-        current_config = conf.file_name();
+        current_config = conf.file_name_str();
     }
 
     if (limiters.find(type) == limiters.end()) {

diff --git a/src/simplescim_ldap_attrs_parser.cpp b/src/simplescim_ldap_attrs_parser.cpp
@@ -51,8 +51,9 @@ class Parser {
 	 * according to global 'parser' object and 'str'.
 	 */
 	void syntax_error(const std::string &str) {
+		auto config = config_file::instance().file_name_str();
 		simplescim_error_string_set_prefix(
-				"%s:ldap-attrs:%lu:%lu:syntax error", config_file::instance().file_name(),
+				"%s:ldap-attrs:%lu:%lu:syntax error", config.c_str(),
 				line, col);
 		simplescim_error_string_set_message("%s", str.c_str()
 		);
@@ -64,8 +65,9 @@ class Parser {
 	 * when the error is of type "expected x, found y".
 	 */
 	void syntax_error_expected(const std::string &str) {
+		auto config = config_file::instance().file_name_str();
 		simplescim_error_string_set_prefix(
-				"%s:ldap-attrs:%lu:%lu:syntax error", config_file::instance().file_name(),
+				"%s:ldap-attrs:%lu:%lu:syntax error", config.c_str(),
 				line, col);
 
 		if (isprint(*cur)) {