rpms/libcmpiutil/devel handle_inv_class.patch, NONE, 1.1 libcmpiutil.spec, 1.5, 1.6

Kaitlin Rupert kaitlin at fedoraproject.org
Wed Sep 17 01:34:09 UTC 2008


Author: kaitlin

Update of /cvs/pkgs/rpms/libcmpiutil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10440

Modified Files:
	libcmpiutil.spec 
Added Files:
	handle_inv_class.patch 
Log Message:
Added handle_inv_class.patch and updated spec file to include new patch.  This is for revision 0.4-3.



handle_inv_class.patch:

--- NEW FILE handle_inv_class.patch ---
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1220466913 25200
# Node ID 36c97d5c8c9f0eea12a87eae4e01bb80c9840ece
# Parent  b27fbfbc713cae6807aa9ecc97ae6de34cc5d5d2
[CU] Fix handling of invalid class in mof parser

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r b27fbfbc713c -r 36c97d5c8c9f eo_util_parser.y
--- a/eo_util_parser.y	Mon Jul 14 15:32:45 2008 -0700
+++ b/eo_util_parser.y	Wed Sep 03 11:35:13 2008 -0700
@@ -23,6 +23,7 @@
 
 #define RC_OK 0
 #define RC_EOF EOF
+#define RC_INVALID_CLASS -1000
 
 /* DEFINE ANY GLOBAL VARS HERE */
 static const CMPIBroker * _BROKER;
@@ -76,6 +77,8 @@
 			*_INSTANCE = CMNewInstance(_BROKER,
 						   op,
 						   NULL);
+			if (*_INSTANCE == NULL)
+				return RC_INVALID_CLASS;
 			free($3);
 			}
 		properties '}' ';'


Index: libcmpiutil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcmpiutil/devel/libcmpiutil.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libcmpiutil.spec	9 Sep 2008 20:17:49 -0000	1.5
+++ libcmpiutil.spec	17 Sep 2008 01:33:39 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: CMPI Utility Library
 Name: libcmpiutil
 Version: 0.4
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: ftp://libvirt.org/libvirt-cim/libcmpiutil-%{version}.tar.gz
@@ -14,7 +14,6 @@
 BuildRequires: bison
 BuildRequires: libxml2-devel
 BuildConflicts: sblim-cmpi-devel
-Patch0: rep_disabled_ind.patch 
 
 %description
 Libcmpiutil is a library of utility functions for CMPI providers.
@@ -40,7 +39,6 @@
 %prep
 %setup -q
 chmod -x *.c *.y *.h *.l
-%patch0 -p1
 
 %build
 %configure --enable-static=no
@@ -77,8 +75,11 @@
 %doc doc/SubmittingPatches
 
 %changelog
+* Wed Sep 03 2008 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.4-3
+- Added add handle_inv_class.patch to handle invalid classes in mof parser 
+
 * Fri Aug 29 2008 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.4-2
-- Added add rep_disabled_ind.patch patch to enable disabled indication reporting
+- Added add rep_disabled_ind.patch to enable disabled indication reporting
 
 * Tue May 20 2008 Dan Smith <danms at us.ibm.com> - 0.4-1
 - Updated to official 0.4 source release




More information about the fedora-extras-commits mailing list