<p>Joshua C. Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10868">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Corey Farrell: Looks good to me, but someone else must approve
  Joshua C. Colp: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">RAII: Change order or variables in clang version<br><br>This prevents use-after-scope issues when unwinding the stack,<br>which happens in reverse order. The varname variable needs to<br>remain alive for the destruction to be able to access it.<br>Issue was found using clang + address-sanitizer.<br><br>ASTERISK-28232 #close<br><br>Change-Id: I00811c34ae910836a5fb6d22304528aef92624db<br>---<br>M include/asterisk/utils.h<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h</span><br><span>index c0cce98..4dc406d 100644</span><br><span>--- a/include/asterisk/utils.h</span><br><span>+++ b/include/asterisk/utils.h</span><br><span>@@ -786,10 +786,10 @@</span><br><span> typedef void (^_raii_cleanup_block_t)(void);</span><br><span> static inline void _raii_cleanup_block(_raii_cleanup_block_t *b) { (*b)(); }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define RAII_VAR(vartype, varname, initval, dtor)                                                                \</span><br><span style="color: hsl(0, 100%, 40%);">-    _raii_cleanup_block_t _raii_cleanup_ ## varname __attribute__((cleanup(_raii_cleanup_block),unused)) = NULL; \</span><br><span style="color: hsl(0, 100%, 40%);">-    __block vartype varname = initval;                                                                           \</span><br><span style="color: hsl(0, 100%, 40%);">-    _raii_cleanup_ ## varname = ^{ {(void)dtor(varname);} }</span><br><span style="color: hsl(120, 100%, 40%);">+#define RAII_VAR(vartype, varname, initval, dtor)                                                              \</span><br><span style="color: hsl(120, 100%, 40%);">+    __block vartype varname = initval;                                                                         \</span><br><span style="color: hsl(120, 100%, 40%);">+    _raii_cleanup_block_t _raii_cleanup_ ## varname __attribute__((cleanup(_raii_cleanup_block),unused)) =     \</span><br><span style="color: hsl(120, 100%, 40%);">+        ^{ {(void)dtor(varname);} };</span><br><span> </span><br><span> #elif defined(__GNUC__)</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10868">change 10868</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.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.asterisk.org/10868"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I00811c34ae910836a5fb6d22304528aef92624db </div>
<div style="display:none"> Gerrit-Change-Number: 10868 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Diederik de Groot <dkgroot@talon.nl> </div>
<div style="display:none"> Gerrit-Reviewer: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation (1000185) </div>
<div style="display:none"> Gerrit-Reviewer: Joshua C. Colp <jcolp@digium.com> </div>