[Sblim-commit] sfcb cimXmlGen.c, 1.72, 1.73 ChangeLog, 1.646, 1.647 NEWS, 1.573, 1.574 contributions.txt, 1.60, 1.61

[Chris B. <buc...@us...>]

Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv21823

Modified Files:
	cimXmlGen.c ChangeLog NEWS contributions.txt 
Log Message:
[ 3202420 ] CDATA value in a string property is improperly XML escaped

Index: cimXmlGen.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimXmlGen.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- cimXmlGen.c	10 Apr 2010 02:18:19 -0000	1.72
+++ cimXmlGen.c	9 Mar 2011 00:40:20 -0000	1.73
@@ -64,7 +64,7 @@
 {
    int i, l, o, n;
    char *out;
-   char *rep;
+   char *rep, *end;
 
    _SFCB_ENTER(TRACE_CIMXMLPROC, "XMLEscape");
 
@@ -82,6 +82,19 @@
 	rep = ">";
 	break;
       case '<':
+
+	/* skip escaping if this is a CDATA section */
+	if ((in[i+1] == '!') && ((l-i) > 11)) {   /* do minimum check, then check if enough chars to compare */
+	  rep = &in[i];
+	  if (!strncmp(rep, "<![CDATA[", 9)) {   /* now look for the cdata start marker */
+	    if ((end = strstr(rep, "]]>"))) {   /* valid cdata should have end marker */
+	      n = ((end-rep)+3);
+	      i += (n - 1);
+	      break;
+	    } /* else, bad format */
+	  }
+	}
+
 	n = 4;
 	rep = "&lt;";
 	break;

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.573
retrieving revision 1.574
diff -u -d -r1.573 -r1.574
--- NEWS	8 Mar 2011 20:47:11 -0000	1.573
+++ NEWS	9 Mar 2011 00:40:20 -0000	1.574
@@ -10,6 +10,7 @@
 - 3185178 Wrong classname for returned instances from execQuery
 - 3175770 execQuery returns multiple instances of same object
 - 3203290 Basic Auth Should Consider Expired Passwords
+- 3202420 CDATA value in a string property is improperly XML escaped
 
 Changes in 1.3.10
 =================

Index: contributions.txt
===================================================================
RCS file: /cvsroot/sblim/sfcb/contributions.txt,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- contributions.txt	17 Nov 2010 16:18:51 -0000	1.60
+++ contributions.txt	9 Mar 2011 00:40:20 -0000	1.61
@@ -178,6 +178,7 @@
 11/08/2010 [ 3101155 ] Failed to load provider libraries due to symbol conflicts
 11/08/2010 [ 3101148 ] SfcbLocal method parameter type conversion and validation
 11/10/2010 [ 3101154 ] Daemon clients failed SfcbLocal connect due to permission
+03/08/2011 [ 3202420 ] CDATA value in a string property is improperly XML escaped
 
 Josef Moellers
 --------------

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.646
retrieving revision 1.647
diff -u -d -r1.646 -r1.647
--- ChangeLog	8 Mar 2011 20:47:11 -0000	1.646
+++ ChangeLog	9 Mar 2011 00:40:20 -0000	1.647
@@ -1,5 +1,9 @@
 2011-03-08  Chris Buccella  <buc...@li...>
 
+	* cimXmlGen.c:
+	[ 3202420 ] CDATA value in a string property is improperly XML escaped
+	(patch by Chris Poblete)
+
 	* httpAdapter.c, sfcBasicPAMAuthentication.c:
 	[ 3203290 ] Basic Auth Should Consider Expired Passwords