mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-31 12:13:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: add null checks for y_image before dereferencing in Analyse

Browse Source 
When analysis_image is set to ANALYSISIMAGE_YCHANNEL but in_frame is
not populated (e.g., LocalCamera which captures directly to image),
get_y_image() returns nullptr. The code was dereferencing this null
pointer in DetectMotion and Blend calls, causing a segfault.

Now checks if y_image is valid before use and skips the operation
with a debug message if unavailable.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Isaac Connor
2026-01-30 14:29:04 -05:00
parent e656ee9fa8
commit b76a7c9640
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/zm_monitor.cpp
View File

@@ -2146,7 +2146,12 @@ bool Monitor::Analyse() {
if (analysis_image == ANALYSISIMAGE_YCHANNEL) {
Image *y_image = packet->get_y_image();
Debug(1, "Detecting motion on image %d, y_image %p", packet->image_index, y_image);
motion_score += DetectMotion(*y_image, zoneSet); // DetectMotion tests for null y_image
if (y_image) {
motion_score += DetectMotion(*y_image, zoneSet);
} else {
// y_image unavailable (e.g., LocalCamera without in_frame) - skip motion detection
Debug(1, "y_image unavailable, skipping motion detection");
}
} else {
Debug(1, "Detecting motion on image %d, image %p", packet->image_index, packet->image);
motion_score += DetectMotion(*(packet->image), zoneSet);
@@ -2197,7 +2202,11 @@ bool Monitor::Analyse() {
if (analysis_image == ANALYSISIMAGE_YCHANNEL) {
Debug(1, "Blending from y-channel");
Image *y_image = packet->get_y_image();
ref_image.Blend(*y_image, ( state==ALARM ? alarm_ref_blend_perc : ref_blend_perc ));
if (y_image) {
ref_image.Blend(*y_image, ( state==ALARM ? alarm_ref_blend_perc : ref_blend_perc ));
} else {
Debug(1, "y_image unavailable, skipping blend");
}
} else if (packet->image) {
Debug(1, "Blending full colour image because analysis_image = %d, in_frame=%p and format %d != %d, %d",
analysis_image, packet->in_frame.get(),