<p>George Joseph <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15011">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pbx.c: On error, ast_add_extension2_lockopt should always free 'data'<br><br>In the event that the desired extension already exists,<br>ast_add_extension2_lockopt() will free the 'data' it is passed before<br>returning an error, so we should not be freeing it ourselves.<br><br>Additionally, there were two places where ast_add_extension2_lockopt()<br>could return an error without also freeing the 'data' pointer, so we<br>add that.<br><br>ASTERISK-29097 #close<br><br>Change-Id: I904707aae55169feda050a5ed7c6793b53fe6eae<br>---<br>M include/asterisk/pbx.h<br>M main/pbx.c<br>M res/parking/parking_bridge_features.c<br>M res/res_parking.c<br>M res/res_pjsip_config_wizard.c<br>5 files changed, 17 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h</span><br><span>index cbc5ec2..c75e50a 100644</span><br><span>--- a/include/asterisk/pbx.h</span><br><span>+++ b/include/asterisk/pbx.h</span><br><span>@@ -492,9 +492,13 @@</span><br><span> * \param callerid pattern to match CallerID, or NULL to match any CallerID</span><br><span> * \param application application to run on the extension with that priority level</span><br><span> * \param data data to pass to the application</span><br><span style="color: hsl(0, 100%, 40%);">- * \param datad</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param datad a pointer to a function that will deallocate \c data when needed</span><br><span style="color: hsl(120, 100%, 40%);">+ * or NULL if \c data does not need to be freed.</span><br><span> * \param registrar who registered the extension</span><br><span> *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \note On any failure, the function pointed to by \c datap will be called and passed the</span><br><span style="color: hsl(120, 100%, 40%);">+ * \c data pointer.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span> * \retval 0 success</span><br><span> * \retval -1 failure</span><br><span> */</span><br><span>@@ -520,7 +524,7 @@</span><br><span> * \since 12.0.0</span><br><span> *</span><br><span> * \note con must be write locked prior to calling. For details about the arguments,</span><br><span style="color: hsl(0, 100%, 40%);">- * check ast_add_extension2()</span><br><span style="color: hsl(120, 100%, 40%);">+ * check ast_add_extension()</span><br><span> */</span><br><span> int ast_add_extension2_nolock(struct ast_context *con, int replace, const char *extension,</span><br><span> int priority, const char *label, const char *callerid,</span><br><span>diff --git a/main/pbx.c b/main/pbx.c</span><br><span>index b520f5f..0609240 100644</span><br><span>--- a/main/pbx.c</span><br><span>+++ b/main/pbx.c</span><br><span>@@ -7346,6 +7346,10 @@</span><br><span> if (ast_strlen_zero(extension)) {</span><br><span> ast_log(LOG_ERROR,"You have to be kidding-- add exten '' to context %s? Figure out a name and call me back. Action ignored.\n",</span><br><span> con->name);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We always need to deallocate 'data' on failure */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (datad) {</span><br><span style="color: hsl(120, 100%, 40%);">+ datad(data);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>@@ -7401,8 +7405,14 @@</span><br><span> }</span><br><span> </span><br><span> /* Be optimistic: Build the extension structure first */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!(tmp = ast_calloc(1, length)))</span><br><span style="color: hsl(120, 100%, 40%);">+ tmp = ast_calloc(1, length);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!tmp) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We always need to deallocate 'data' on failure */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (datad) {</span><br><span style="color: hsl(120, 100%, 40%);">+ datad(data);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (ast_strlen_zero(label)) /* let's turn empty labels to a null ptr */</span><br><span> label = 0;</span><br><span>diff --git a/res/parking/parking_bridge_features.c b/res/parking/parking_bridge_features.c</span><br><span>index 5bcdb21..6863d52 100644</span><br><span>--- a/res/parking/parking_bridge_features.c</span><br><span>+++ b/res/parking/parking_bridge_features.c</span><br><span>@@ -660,7 +660,6 @@</span><br><span> dial_string_flat, PARK_DIAL_CONTEXT, ast_get_extension_registrar(existing_exten));</span><br><span> } else if (ast_add_extension2_nolock(park_dial_context, 1, dial_string_flat, 1, NULL, NULL,</span><br><span> "Dial", duplicate_returnexten, ast_free_ptr, BASE_REGISTRAR, NULL, 0)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_free(duplicate_returnexten);</span><br><span> ast_log(LOG_ERROR, "Failed to create parking redial parker extension %s@%s - Dial(%s)\n",</span><br><span> dial_string_flat, PARK_DIAL_CONTEXT, returnexten);</span><br><span> }</span><br><span>diff --git a/res/res_parking.c b/res/res_parking.c</span><br><span>index 470396d..cde82d2 100644</span><br><span>--- a/res/res_parking.c</span><br><span>+++ b/res/res_parking.c</span><br><span>@@ -721,7 +721,6 @@</span><br><span> </span><br><span> if (ast_add_extension2_nolock(context, replace, extension, priority, NULL, NULL,</span><br><span> application, data_duplicate, ast_free_ptr, registrar, NULL, 0)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_free(data_duplicate);</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>diff --git a/res/res_pjsip_config_wizard.c b/res/res_pjsip_config_wizard.c</span><br><span>index aec4b58..e61b7c5 100644</span><br><span>--- a/res/res_pjsip_config_wizard.c</span><br><span>+++ b/res/res_pjsip_config_wizard.c</span><br><span>@@ -475,7 +475,6 @@</span><br><span> </span><br><span> if (ast_add_extension2_nolock(context, 0, exten, priority, NULL, NULL,</span><br><span> app, data, free_ptr, BASE_REGISTRAR, NULL, 0)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_free(data);</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15011">change 15011</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/c/asterisk/+/15011"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 17 </div>
<div style="display:none"> Gerrit-Change-Id: I904707aae55169feda050a5ed7c6793b53fe6eae </div>
<div style="display:none"> Gerrit-Change-Number: 15011 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>