]> git.puffer.fish Git - mirror/frr.git/commitdiff
lib: grpc: initialize uninitialized member variables
authorChristian Hopps <chopps@labn.net>
Sat, 26 Feb 2022 12:55:32 +0000 (07:55 -0500)
committermergify-bot <noreply@mergify.com>
Mon, 7 Mar 2022 19:49:17 +0000 (19:49 +0000)
fixes #9732, fixes #10578

Signed-off-by: Christian Hopps <chopps@labn.net>
(cherry picked from commit c85ecd64050faccd9796ff9e8b935c3b0868eb7b)

lib/northbound_grpc.cpp

index 69669a288e1cf78e3d5e7073817a913fe6ef73e6..2d9b61483bfdb8e1a16cc5f7db8b3bfc1a2ea5ac 100644 (file)
@@ -1,7 +1,7 @@
 //
+// Copyright (c) 2021-2022, LabN Consulting, L.L.C
 // Copyright (C) 2019  NetDEF, Inc.
 //                     Renato Westphal
-// Copyright (c) 2021, LabN Consulting, L.L.C
 //
 // This program is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
@@ -227,7 +227,6 @@ template <typename Q, typename S> class NewRpcState : RpcStateBase
                pthread_mutex_unlock(&_tag->cmux);
                return 0;
        }
-       NewRpcState<Q, S> *orig;
 
        const char *name;
        grpc::ServerContext ctx;
@@ -238,12 +237,12 @@ template <typename Q, typename S> class NewRpcState : RpcStateBase
 
        Candidates *cdb;
        void (*callback)(NewRpcState<Q, S> *);
-       reqfunc_t requestf;
-       reqsfunc_t requestsf;
+       reqfunc_t requestf = NULL;
+       reqsfunc_t requestsf = NULL;
 
        pthread_mutex_t cmux = PTHREAD_MUTEX_INITIALIZER;
        pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-       void *context;
+       void *context = 0;
 
        CallState state = CREATE;
 };