[Sblim-commit] sfcb ChangeLog, 1.651, 1.652 NEWS, 1.578, 1.579 cimcClientSfcbLocal.c, 1.38, 1.39

[Michael Chase-S. <mc...@us...>]

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

Modified Files:
	ChangeLog NEWS cimcClientSfcbLocal.c 
Log Message:
[3213591] Local intf client abort abnormally on enum filter syntax err


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -d -r1.578 -r1.579
--- NEWS	4 Apr 2011 22:37:18 -0000	1.578
+++ NEWS	5 Apr 2011 21:02:53 -0000	1.579
@@ -4,6 +4,7 @@
 Bugs fixed:
 
 - 3261868 Enum CQL filter on NULL cause incorrect rsp
+- 3213591 Local intf client abort abnormally on enum filter syntax err
 
 Changes in 1.3.11
 =================

Index: cimcClientSfcbLocal.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimcClientSfcbLocal.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- cimcClientSfcbLocal.c	10 Nov 2010 23:48:25 -0000	1.38
+++ cimcClientSfcbLocal.c	5 Apr 2011 21:02:53 -0000	1.39
@@ -779,11 +779,20 @@
    
    oHdr.nameSpace=setCharsMsgSegment((char*)ns->hdl);
    qs=parseQuery(MEM_TRACKED,query,lang,NULL,&irc);
+
+   if (irc) {
+      CIMCSetStatusWithChars(rc, CMPI_RC_ERR_INVALID_QUERY,
+         "syntax error in query.");
+      _SFCB_RETURN(NULL);
+   }
    
    fCls=qs->ft->getFromClassList(qs);
    if (fCls==NULL || *fCls==NULL) {
      mlogf(M_ERROR,M_SHOW,"--- from clause missing\n");
-     abort();
+     CIMCSetStatusWithChars(rc, CMPI_RC_ERR_INVALID_QUERY,
+        "required from clause is missing.");
+     _SFCB_RETURN(NULL);
+
    }
    oHdr.className = setCharsMsgSegment(*fCls);
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.651
retrieving revision 1.652
diff -u -d -r1.651 -r1.652
--- ChangeLog	4 Apr 2011 22:37:18 -0000	1.651
+++ ChangeLog	5 Apr 2011 21:02:53 -0000	1.652
@@ -1,3 +1,9 @@
+2011-04-05 Michael Chase-Salerno <br...@li...>
+
+	* cimcClientSfcbLocal.c:
+	[ 3213591 ] Local intf client abort abnormally on enum filter syntax err
+	(patch by cpoblete)
+
 2011-04-04 Michael Chase-Salerno <br...@li...>
 
 	* queryOperation.c, providerDrv.c