[icinga-checkins] icinga.org: icinga-core/tdressler/fixes: idoutils: fix doubled quotes by skipping escaping data (Oracle only) #2534

git at icinga.org git at icinga.org
Sat Oct 27 21:15:45 CEST 2012


Module: icinga-core
Branch: tdressler/fixes
Commit: aef573dc6eb2f3e0ef9fc112ca1a94f450ccedb8
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=aef573dc6eb2f3e0ef9fc112ca1a94f450ccedb8

Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Fri Apr 27 21:24:15 2012 +0200

idoutils: fix doubled quotes by skipping escaping data (Oracle only) #2534
refs #2534

---

 Changelog                |    1 +
 module/idoutils/src/db.c |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index 1f4d966..c81f5a0 100644
--- a/Changelog
+++ b/Changelog
@@ -379,6 +379,7 @@ FIXES
 * idoutils: add note to "if process data is not dumped via idomod, ido2db won't clean tables and set objects inactive" #2237 - MF
 * idoutils: fix pgsql unix_timestamp cannot handle timstamp with timezone #2203 - MF
 * idoutils: fix ido2db forks endless if database is not available, race condition on unclosed socket #2458 - MF/TD/CF
+* idoutils: fix doubled quotes by skipping escaping data (Oracle only) #2534 - TD
 
 * install: Fix notification template installation (Todd Zullinger) #2235 - MF
 * install: uninstall old idomod.o #2570 - MF
diff --git a/module/idoutils/src/db.c b/module/idoutils/src/db.c
index 361820a..bc2a973 100644
--- a/module/idoutils/src/db.c
+++ b/module/idoutils/src/db.c
@@ -2388,16 +2388,19 @@ char *ido2db_db_escape_string(ido2db_idi *idi, char *buf) {
 	if (idi == NULL || buf == NULL)
 		return NULL;
 
+<<<<<<< HEAD
 	ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ido2db_db_escape_string('%s') start\n", buf);
 
 	/* init variables to make compilers happy */
 	x=0;
 	y=0;
 
+=======
+>>>>>>> idoutils: fix doubled quotes by skipping escaping data (Oracle only) #2534
 	z = strlen(buf);
 	if ((newbuf = (char *) malloc((z * 2) + 1)) == NULL) {
-		ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ido2db_db_escape_string('%s') Error: memory allocation failed \n", buf);
-		return NULL;
+			ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ido2db_db_escape_string('%s') Error: memory allocation failed \n", buf);
+			return NULL;
 	}
 
 #ifdef USE_ORACLE





More information about the icinga-checkins mailing list