]> granicus.if.org Git - p11-kit/commitdiff
build: Check return value of p11_dict_set
authorDaiki Ueno <dueno@redhat.com>
Tue, 16 Oct 2018 16:14:46 +0000 (18:14 +0200)
committerDaiki Ueno <ueno@gnu.org>
Wed, 17 Oct 2018 08:13:32 +0000 (10:13 +0200)
p11-kit/proxy.c
p11-kit/rpc-server.c
trust/module.c

index abe793556f341ec6b597abfc596c37ea47f6c44b..11e6165f5f6e27b832f461091a1e1bb63a87f3bf 100644 (file)
@@ -612,7 +612,8 @@ proxy_C_OpenSession (CK_X_FUNCTION_LIST *self,
                                sess->wrap_slot = map.wrap_slot;
                                sess->real_session = *handle;
                                sess->wrap_session = ++state->last_handle; /* TODO: Handle wrapping, and then collisions */
-                               p11_dict_set (state->px->sessions, &sess->wrap_session, sess);
+                               if (!p11_dict_set (state->px->sessions, &sess->wrap_session, sess))
+                                       warn_if_reached ();
                                *handle = sess->wrap_session;
                        }
 
index 2db3524579e9f2e739dc4ee09a310f1f9abefae4..3a8991d7a14d5b423621f255529e108c16ea8394 100644 (file)
@@ -2226,7 +2226,11 @@ p11_kit_remote_serve_tokens (const char **tokens,
                                p11_message_err (error, "couldn't subclass filter");
                                goto out;
                        }
-                       p11_dict_set (filters, module, filter);
+                       if (!p11_dict_set (filters, module, filter)) {
+                               error = EINVAL;
+                               p11_message_err (error, "couldn't register filter");
+                               goto out;
+                       }
                }
 
                for (i = 0; i < n_tokens; i++) {
index e09113b548c6d950debc0009eaf2550a2622f4de..24cda876c3b0bc6af4c7b97fe108451d8a679f57 100644 (file)
@@ -1321,7 +1321,8 @@ find_objects_match (CK_ATTRIBUTE *attrs,
                        }
                        value = memdup (oid->pValue, oid->ulValueLen);
                        return_val_if_fail (value != NULL, false);
-                       p11_dict_set (find->extensions, value, value);
+                       if (!p11_dict_set (find->extensions, value, value))
+                               warn_if_reached ();
                }
        }