[Bf-blender-cvs] [7c99b71] master: fix null pointer dereferences

[Mike Erwin]

Commit: 7c99b7110e89636e16035e10ee2795a192295024
Author: Mike Erwin
Date:   Thu Jul 21 18:15:54 2016 -0400
Branches: master
https://developer.blender.org/rB7c99b7110e89636e16035e10ee2795a192295024

fix null pointer dereferences

Found with PVS-Studio T48917

===================================================================

M	source/blender/blenkernel/intern/tracking_util.c
M	source/blender/freestyle/intern/view_map/Functions1D.cpp

===================================================================

diff --git a/source/blender/blenkernel/intern/tracking_util.c b/source/blender/blenkernel/intern/tracking_util.c
index a40e4f7..a90b1de 100644
--- a/source/blender/blenkernel/intern/tracking_util.c
+++ b/source/blender/blenkernel/intern/tracking_util.c
@@ -762,8 +762,8 @@ static ImBuf *accessor_get_ibuf(TrackingImageAccessor *accessor,
 			final_ibuf = IMB_dupImBuf(orig_ibuf);
 		}
 		IMB_scaleImBuf(final_ibuf,
-		               ibuf->x / (1 << downscale),
-		               ibuf->y / (1 << downscale));
+		               orig_ibuf->x / (1 << downscale),
+		               orig_ibuf->y / (1 << downscale));
 	}
 
 	if (transform != NULL) {
@@ -780,7 +780,7 @@ static ImBuf *accessor_get_ibuf(TrackingImageAccessor *accessor,
 	}
 
 	if (input_mode == LIBMV_IMAGE_MODE_RGBA) {
-		BLI_assert(ibuf->channels == 3 || ibuf->channels == 4);
+		BLI_assert(orig_ibuf->channels == 3 || orig_ibuf->channels == 4);
 		/* pass */
 	}
 	else /* if (input_mode == LIBMV_IMAGE_MODE_MONO) */ {
diff --git a/source/blender/freestyle/intern/view_map/Functions1D.cpp b/source/blender/freestyle/intern/view_map/Functions1D.cpp
index 11e0cc3..8f16f78 100644
--- a/source/blender/freestyle/intern/view_map/Functions1D.cpp
+++ b/source/blender/freestyle/intern/view_map/Functions1D.cpp
@@ -104,7 +104,7 @@ int QuantitativeInvisibilityF1D::operator()(Interface1D& inter)
 	}
 	FEdge *fe = dynamic_cast<FEdge*>(&inter);
 	if (fe) {
-		result = ve->qi();
+		result = fe->qi();
 		return 0;
 	}
 	result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration);