dtcm: Resolve CID 87713

[oweals/cde.git] / cde / programs / dtcm / server / cmsfunc.c

diff --git a/cde/programs/dtcm/server/cmsfunc.c b/cde/programs/dtcm/server/cmsfunc.c
index a99d0fedf8f11213e31293d5b1f7aa79b68bd59e..618d15a78f0feceb3d8241cfa1c8ea23802f6d8c 100644 (file)
--- a/cde/programs/dtcm/server/cmsfunc.c
+++ b/cde/programs/dtcm/server/cmsfunc.c
@@ -87,12 +87,10 @@ static CSA_return_code _DtCmsGetOldCalAttrNames(_DtCmsCalendar *cal,
 extern void *
 cms_ping_5_svc(void *args, struct svc_req *svcrq)
 {
-       char dummy;
-
        if (debug)
                fprintf(stderr, "cms_ping_5_svc called\n");
 
-       return((void *)&dummy); /* for RPC reply */
+       return(NULL); /* for RPC reply */
 }
 
 
@@ -1241,7 +1239,7 @@ _DtCmsCreateCallog(char *user, cms_create_args *args, _DtCmsCalendar **newcal)
 
        /* use passed in char set if client does not supply one */
        if (cal->attrs[CSA_CAL_ATTR_CHARACTER_SET_I].value == NULL &&
-            args->char_set && *args->char_set != NULL) {
+            args->char_set && *args->char_set != '\0') {
                if ((stat = _DtCm_set_string_attrval(args->char_set,
                    &cal->attrs[CSA_CAL_ATTR_CHARACTER_SET_I].value,
                    CSA_VALUE_STRING)) != CSA_SUCCESS) {
@@ -1337,7 +1335,7 @@ _grow_char_array(void *ptr, uint oldcount, uint newcount)
        void *nptr;
 
        if (nptr = realloc(ptr, newcount)) {
-               memset((void *)((char *)nptr + oldcount), NULL,
+               memset((void *)((char *)nptr + oldcount), 0,
                        newcount - oldcount);
                return (nptr);
        } else