From 839d93ac969bc1a152982464907445bc0d18a1f8 Mon Sep 17 00:00:00 2001
From: Arnaud Diederen <Arnaud Diederen arnaud@hex-rays.com>
Date: Mon, 15 Nov 2021 13:52:04 +0100
Subject: [PATCH] Backported fixes

---
 out_of_tree/parsed_notifications.zip | Bin 4364078 -> 4364078 bytes
 python/idc.py                        |  27 +++------------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/out_of_tree/parsed_notifications.zip b/out_of_tree/parsed_notifications.zip
index 0d1a6178bfc3948127a581d48fb7514cfa455b99..79eebe00a82e356be17f6b81ad37d14cc313c83b 100644
GIT binary patch
delta 228
zcmWl~OEy9Q0D$462a4-a30IL<FGUX(iqZ<2S&pM~{)rI=*~IV8ti^UP_|6waud(RQ
z+bI6?^zlBP{rCC&6@)M162>r&2~6TLuHY)BFpX=tjsb4qCT`(2W-yC6+`&BV;vVi}
zhzD4}A|B!qmhc!)@D$JR9Lre2D%P-$7udiiUg8zDu#Fw;;x+cLj|05HTfD;|j_@8I
NaEudt{B}BD`~v;HWaj_?

delta 228
zcmWl~*;0W40D#d+3yG}JqU_o&p(qu-fLEfK@1~m=GxZW*|DE@%F3y}F_y`4m7Nb>m
zmRU~6|9yY{#G`X@14FopTeyuo7{&<hVifl<hH>1-1ST<sY0O|24={&$Jj5eB#uF^y
zDV|{wOIXGVR<VY4Y~VRw;3Zz+HQwMYHnD|m?BE@Cv4?%U#|IqX5FhagNBE2{_=;nk
JtbKd``UM<CW7Plv

diff --git a/python/idc.py b/python/idc.py
index a9185f7..f78eadf 100644
--- a/python/idc.py
+++ b/python/idc.py
@@ -790,32 +790,11 @@ def define_local_var(start, end, location, name):
     if m:
         # Location in the form of [bp+xx]
         register = ida_idp.str2reg(m.group(1))
-        offset = int(m.group(2), 0)
-        frame = ida_frame.get_frame(func)
-
-        if register == -1 or not frame:
+        if register == -1:
             return 0
 
-        offset += func.frsize
-        member = ida_struct.get_member(frame, offset)
-
-        if member:
-            # Member already exists, rename it
-            if ida_struct.set_member_name(frame, offset, name):
-                return 1
-            else:
-                return 0
-        else:
-            # No member at the offset, create a new one
-            if ida_struct.add_struc_member(
-                    frame,
-                    name,
-                    offset,
-                    ida_bytes.byte_flag(),
-                    None, 1) == 0:
-                return 1
-            else:
-                return 0
+        offset = int(m.group(2), 0)
+        return 1 if ida_frame.define_stkvar(func, name, offset, ida_bytes.byte_flag(), None, 1) else 0
     else:
         # Location as simple register name
         return ida_frame.add_regvar(func, start, end, location, name, None)