diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2016-07-22 01:15:54 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2016-07-22 01:16:08 +0300 |
| commit | 7c99b7110e89636e16035e10ee2795a192295024 (patch) | |
| tree | 2ded0ec855524a24bb2117b4f7f350fbd19b6e23 | |
| parent | 23f1b2073f4a98256dc368fccb9603295d04fa6a (diff) | |
fix null pointer dereferences
Found with PVS-Studio T48917
| -rw-r--r-- | source/blender/blenkernel/intern/tracking_util.c | 6 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/view_map/Functions1D.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/tracking_util.c b/source/blender/blenkernel/intern/tracking_util.c index a40e4f72636..a90b1dee927 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 11e0cc37d4d..8f16f78cb10 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); |