From bf7ca623a65f25cc4ac7a3ca0d6635331ec07c25 Mon Sep 17 00:00:00 2001
From: Rémi Verschelde
Date: Thu, 19 Apr 2018 13:04:41 +0200
Subject: Fix Coverity reports of uninitialized scalar variable

Fixes most current reports on Coverity Scan of uninitialized scalar
variable (CWE-457): https://cwe.mitre.org/data/definitions/457.html

These happen most of the time (in our code) when instanciating structs
without a constructor (or with an incomplete one), and later returning
the instance. This is sometimes intended though, as some parameters are
only used in some situations and should not be double-initialized for
performance reasons (e.g. `constant` in ShaderLanguage::Token).
---
 servers/physics/body_pair_sw.cpp       | 1 +
 servers/physics_2d/body_pair_2d_sw.cpp | 1 +
 servers/visual/shader_language.h       | 1 +
 3 files changed, 3 insertions(+)

(limited to 'servers')

diff --git a/servers/physics/body_pair_sw.cpp b/servers/physics/body_pair_sw.cpp
index 882d201f6..2a6a9e08a 100644
--- a/servers/physics/body_pair_sw.cpp
+++ b/servers/physics/body_pair_sw.cpp
@@ -78,6 +78,7 @@ void BodyPairSW::contact_added_callback(const Vector3 &p_point_A, const Vector3
 	contact.local_A = local_A;
 	contact.local_B = local_B;
 	contact.normal = (p_point_A - p_point_B).normalized();
+	contact.mass_normal = 0; // will be computed in setup()
 
 	// attempt to determine if the contact will be reused
 	real_t contact_recycle_radius = space->get_contact_recycle_radius();
diff --git a/servers/physics_2d/body_pair_2d_sw.cpp b/servers/physics_2d/body_pair_2d_sw.cpp
index f51882b5e..61c0e0063 100644
--- a/servers/physics_2d/body_pair_2d_sw.cpp
+++ b/servers/physics_2d/body_pair_2d_sw.cpp
@@ -62,6 +62,7 @@ void BodyPair2DSW::_contact_added_callback(const Vector2 &p_point_A, const Vecto
 	contact.local_B = local_B;
 	contact.reused = true;
 	contact.normal = (p_point_A - p_point_B).normalized();
+	contact.mass_normal = 0; // will be computed in setup()
 
 	// attempt to determine if the contact will be reused
 
diff --git a/servers/visual/shader_language.h b/servers/visual/shader_language.h
index e8cdf1f89..2e3881179 100644
--- a/servers/visual/shader_language.h
+++ b/servers/visual/shader_language.h
@@ -425,6 +425,7 @@ public:
 
 		FunctionNode() {
 			type = TYPE_FUNCTION;
+			return_type = TYPE_VOID;
 			return_precision = PRECISION_DEFAULT;
 			can_discard = false;
 		}
-- 
cgit v1.2.3-70-g09d2