Fix "off by one" error figuring out failed subcommand.

sippy · Jul 24, 2024 · d2f0be8 · d2f0be8
1 parent 0814429
commit d2f0be8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sippy/Rtp_proxy/Session/update.py b/sippy/Rtp_proxy/Session/update.py
@@ -53,13 +53,13 @@ def process_rtpp_result(self, result):
             return
         ur = update_result()
         if len(self.subcommands) > 0:
-            expected = sum([1 for sc in self.subcommands for _ in sc.commands])
             if len(t0) > 1:
                 subc_ress = [x.strip() for x in t0[1].split('&&')]
                 actual = len(subc_ress)
             else:
                 subc_ress = []
                 actual = 0
+            expected = sum(len(sc.commands) for sc in self.subcommands)
             if actual > expected:
                 ex = RtpProxyError(f'RTPProxy errored: too many results, {actual=}, {expected=}')
                 self.result_callback(None, self.rtpps, ex=ex)
@@ -70,7 +70,7 @@ def process_rtpp_result(self, result):
                     if foff > len(subc.commands):
                         foff -= len(subc.commands)
                         continue
-                    ex = RtpProxyError(f'RTPProxy errored: {subc.commands[foff]}: {subc_ress[-1]}')
+                    ex = RtpProxyError(f'RTPProxy errored: {subc.commands[foff - 1]}: {subc_ress[-1]}')
                     self.result_callback(None, self.rtpps, ex=ex)
                     return None
             if actual < expected: