Fix potential null pointer dereference

52a8d37f · Dmitry-Me · 3c54c50c · 52a8d37f
Commit 52a8d37f authored Mar 16, 2015 by Dmitry-Me
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

calibration.cpp modules/calib3d/src/calibration.cpp +4 -1

No files found.
--- a/modules/calib3d/src/calibration.cpp
+++ b/modules/calib3d/src/calibration.cpp
@@ -1595,7 +1595,10 @@ void cvCalibrationMatrixValues( const CvMat *calibMatr, CvSize imgSize,
        my = imgHeight / apertureHeight;
    } else {
        mx = 1.0;
-        my = *pasp;
+        if(pasp)
+            my = *pasp;
+        else
+            my = 1.0;
    }
    /* Calculate fovx and fovy. */