Update of /cvsroot/sblim/wbemcli
In directory vz-cvs-3.sog:/tmp/cvs-serv18295
Modified Files:
CimXml.cpp NEWS contributions.txt
Log Message:
Fixed 2991546: Core dumps when property contains value within "[]"
(Patch by Aruna Venkataraman)
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/wbemcli/NEWS,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- NEWS 22 Jun 2011 05:41:32 -0000 1.40
+++ NEWS 22 Jun 2011 05:58:39 -0000 1.41
@@ -4,6 +4,7 @@
Bugs:
- 3324380 support optional CIMType in KEYVALUE element
- 3216622 wbemcli throws parser error on CDATA string value
+- 2991546 Core dumps when property contains value within "[]"
Changes in Version 1.6.1
========================
Index: contributions.txt
===================================================================
RCS file: /cvsroot/sblim/wbemcli/contributions.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- contributions.txt 22 Jun 2011 05:41:32 -0000 1.7
+++ contributions.txt 22 Jun 2011 05:58:39 -0000 1.8
@@ -18,6 +18,10 @@
********************************************************************************
+06/21/2011 by Aruna Venkataraman
+--------------------------------
+[ 2991546 ] Core dumps when property contains value within "[]"
+
06/21/2011 by Chris Poblete, Dell
---------------------------------
[ 3216622 ] wbemcli throws parser error on CDATA string value
Index: CimXml.cpp
===================================================================
RCS file: /cvsroot/sblim/wbemcli/CimXml.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- CimXml.cpp 22 Jun 2011 05:41:32 -0000 1.70
+++ CimXml.cpp 22 Jun 2011 05:58:39 -0000 1.71
@@ -3018,7 +3018,13 @@
}
else {
p=strchr(u,']'); // make sure we don't grab inside the []
- p=strchr(p,':');
+
+ if(NULL != p){
+ p=strchr(p,':');
+ }
+ else{ //Clearly a case where the b('[') was found beyond addrress part
+ p=strchr(u,':');
+ }
}
if (!p) {
|
