Fix potential null pointer dereference

2015-03-16 18:36:12 +03:00 · 2015-03-16 18:36:12 +03:00 · 52a8d37f11
commit 52a8d37f11
parent 3c54c50c5a
1 changed files with 4 additions and 1 deletions
--- 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. */