<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20979">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">measurement.c: fix integer overflow problem<br><br>The variables num_meas_sub_expect - num_meas_sub must not be subtracted<br>without prior checking. Depending on the input (which might be<br>errornous), num_meas_sub might be greater then num_meas_sub_expect. This<br>eventually leads into odd behavior, which can be difficult to debug.<br><br>Change-Id: I381cc637d1c125f279ccf88db114609946fe24fe<br>Related: OS#4799<br>---<br>M src/common/measurement.c<br>1 file changed, 3 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/79/20979/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/measurement.c b/src/common/measurement.c</span><br><span>index d5c3ee0..a388847 100644</span><br><span>--- a/src/common/measurement.c</span><br><span>+++ b/src/common/measurement.c</span><br><span>@@ -642,7 +642,9 @@</span><br><span>                        * negotiated in AMR, so we can not know if and how many</span><br><span>                      * SUB frames are missing. */</span><br><span>                        if (lchan->tch_mode != GSM48_CMODE_SPEECH_AMR) {</span><br><span style="color: hsl(0, 100%, 40%);">-                             if (num_ul_meas_expect - i <= num_meas_sub_expect - num_meas_sub) {</span><br><span style="color: hsl(120, 100%, 40%);">+                                if (num_meas_sub < num_meas_sub_expect</span><br><span style="color: hsl(120, 100%, 40%);">+                                 && num_ul_meas_expect - i <=</span><br><span style="color: hsl(120, 100%, 40%);">+                               num_meas_sub_expect - num_meas_sub) {</span><br><span>                                    num_meas_sub_subst++;</span><br><span>                                        is_sub = true;</span><br><span>                               }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20979">change 20979</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/20979"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I381cc637d1c125f279ccf88db114609946fe24fe </div>
<div style="display:none"> Gerrit-Change-Number: 20979 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>