From: Dave H. <hel...@us...> - 2013-07-24 16:55:37
|
Update of /cvsroot/sblim/cmpi-syslog/syslog-log In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27140/syslog-log Modified Files: Syslog_LogRecord.c Syslog_MessageLog.c Log Message: patchset and version bump for 0.9.0 release Index: Syslog_LogRecord.c =================================================================== RCS file: /cvsroot/sblim/cmpi-syslog/syslog-log/Syslog_LogRecord.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Syslog_LogRecord.c 22 May 2009 03:50:49 -0000 1.8 +++ Syslog_LogRecord.c 24 Jul 2013 16:55:35 -0000 1.9 @@ -172,12 +172,27 @@ bzero(&logrecbuf, sizeof(Syslog_LogRecord)); nd = CMGetKey(cop, "LogName", &st); + if (st.msg != NULL || nd.value.string == NULL) { + CMSetStatusWithChars(_broker, &st, CMPI_RC_ERR_FAILED, + "Cannot read instance attribute."); + return st; + } logname = CMGetCharPtr(nd.value.string); nd = CMGetKey(cop, "RecordId", &st); + if (st.msg != NULL || nd.value.string == NULL) { + CMSetStatusWithChars(_broker, &st, CMPI_RC_ERR_FAILED, + "Cannot read instance attribute."); + return st; + } recordid = CMGetCharPtr(nd.value.string); nd = CMGetKey(cop, "MessageTimestamp", &st); + if (st.msg != NULL || nd.value.string == NULL) { + CMSetStatusWithChars(_broker, &st, CMPI_RC_ERR_FAILED, + "Cannot read instance attribute."); + return st; + } timestamp = CMGetCharPtr(nd.value.string); logrecbuf.logname=strdup(logname); Index: Syslog_MessageLog.c =================================================================== RCS file: /cvsroot/sblim/cmpi-syslog/syslog-log/Syslog_MessageLog.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Syslog_MessageLog.c 22 May 2009 03:50:49 -0000 1.6 +++ Syslog_MessageLog.c 24 Jul 2013 16:55:35 -0000 1.7 @@ -142,6 +142,11 @@ bzero(&logbuf, sizeof(Syslog_MessageLog)); nd = CMGetKey(cop, "Name", &st); + if (st.msg != NULL || nd.value.string == NULL) { + CMSetStatusWithChars(_broker, &st, CMPI_RC_ERR_FAILED, + "Cannot read instance attribute."); + return st; + } name = CMGetCharPtr(nd.value.string); logbuf.svName=strdup(name); if (st.rc == CMPI_RC_OK && |