From 808c3e7f20ab459a53ab008cd90851e45720b8b6 Mon Sep 17 00:00:00 2001 From: Donat Zenichev Date: Mon, 12 Aug 2024 09:33:52 +0200 Subject: [PATCH] MT#60476 sdp_version_replace: don't check src_orig ptr Already checked before in sdp_version_check. Fixes defect: /daemon/sdp.c: 2936 in sdp_version_replace() 2930 /* update string unconditionally to keep position tracking intact */ 2931 chopper_replace(chop, &origin->version_str, &origin->version_output_pos, version_str, version_len); 2932 } 2933 } 2934 /* for sdp_create */ 2935 else { >>> CID 1598877: Null pointer dereferences (REVERSE_INULL) >>> Null-checking "src_orig" suggests that it may be null, but it has already been dereferenced on all paths leading to the check. 2936 if (!other_orig || !src_orig) 2937 return; 2938 2939 other_orig->version_num = src_orig->version_num; 2940 /* is our new value longer? */ 2941 if (version_len > other_orig->version_str.len) { Change-Id: I068a13ccc454fd61600546d05c78bde979203fc7 --- daemon/sdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/sdp.c b/daemon/sdp.c index 194998ca9..ef654e1ae 100644 --- a/daemon/sdp.c +++ b/daemon/sdp.c @@ -2933,7 +2933,7 @@ static void sdp_version_replace(struct sdp_chopper *chop, GString *s, } /* for sdp_create */ else { - if (!other_orig || !src_orig) + if (!other_orig) return; other_orig->version_num = src_orig->version_num;