Remove Coverity lint

Unidata · Jul 18, 2018 · d65a53d · d65a53d
1 parent e1f7529
commit d65a53d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGE_LOG b/CHANGE_LOG
@@ -1,3 +1,6 @@
+6.13.7.29
+    Eliminate Coverity Scan lint.
+
 6.13.7.28	2018-07-18T15:33:52-0600
     Added OESS makefiles.
 

diff --git a/misc/Executor.c b/misc/Executor.c
@@ -215,8 +215,8 @@ executor_unlock(Executor* const executor);
 static void
 job_run(Job* const job)
 {
-    void* result;
-    int   status;
+    void* result = NULL;
+    int   status = 0;
 
     job_lock(job);
         if (!job->canceled) {

diff --git a/misc/Future.c b/misc/Future.c
@@ -309,9 +309,11 @@ future_setResult(
     future_assertValid(future);
 
     future_lock(future);
-        future->runStatus = runStatus;
-        future->result = result;
         future->wasCanceled = wasCanceled;
+        if (!wasCanceled) {
+            future->runStatus = runStatus;
+            future->result = result;
+        }
         future->haveResults = true;
 
         int status = pthread_cond_broadcast(&future->cond);