Changeset 539 for trunk/src/sh_registry.c

Timestamp:

Jan 7, 2019, 8:03:37 PM (6 years ago)

Author:

katerina

Message:

Fixes for tickets #431 (OpenBSD compatibility) and #432 (compiler warnings).

File:

• trunk/src/sh_registry.c (modified) (4 diffs)

trunk/src/sh_registry.c

@@ -841 +841 @@
   size_t len;
   int    retval = -1;
+
+  if (!subkey)
+    return 0;
   
   len = strlen(path) + 1 + strlen(subkey) + 1;
@@ -934 +937 @@
 {
   HKEY topKey;
-  char * subkey;
+  char * subkey = NULL;
   char path[20] = "";
   int pos = 0;
@@ -974 +977 @@
   else
     {
-
+      /* We bail out here if the topKey is undefined */
       char * tmp = sh_util_safe_name_keepspace(key);
       size_t tlen = sl_strlen(tmp);
@@ -1003 +1006 @@
   *************************/
 
+  /* Returns 0 if !subkey */
+  /* cppcheck-suppress uninitvar */
   return CheckThisSubkey (topKey, subkey, path, isSingle, 0);
 }