assigned-uniqueids: Miscellaneous cleanup and fixes.

* Fix memory leak in ast_unreal_new_channels().  Made it generate the ;2
uniqueid on a stack variable instead of mallocing it.

* Made send error response to ARI and AMI requests instead of just logging
excessive uniqueid length and allowing truncation.  action_originate() and
ari_channels_handle_originate_with_id().

* Fixed minor truncating uniqueid hole when generating the ;2 uniqueid
string length.  Created public and internal lengths of uniqueid.  The
internal length can handle a max public uniqueid plus an appended ;2.

* free() and ast_free() are NULL tolerant so they don't need a NULL test
before calling.

* Made use better struct initialization format instead of the position
dependent initialization format.  Also anything not explicitly initialized
in the struct is initialized to zero by the compiler.

* Made ast_channel_internal_set_fake_ids() use the safer
ast_copy_string() instead of strncpy().

Review: https://reviewboard.asterisk.org/r/3371/
........

Merged revisions 410949 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410950 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 11 insertions, 17 deletions

diff --git a/main/dial.c b/main/dial.c
index 246d4f406..bf0d51c5e 100644
--- a/main/dial.c
+++ b/main/dial.c
@@ -266,8 +266,7 @@ int ast_dial_append(struct ast_dial *dial, const char *tech, const char *device,
 	channel->device = ast_strdup(device);
 
 	/* Store the assigned id */
-	if (assignedids && !ast_strlen_zero(assignedids->uniqueid))
-	{
+	if (assignedids && !ast_strlen_zero(assignedids->uniqueid)) {
 		channel->assignedid1 = ast_strdup(assignedids->uniqueid);
 
 		if (!ast_strlen_zero(assignedids->uniqueid2)) {
@@ -293,7 +292,10 @@ static int begin_dial_prerun(struct ast_dial_channel *channel, struct ast_channe
 	char numsubst[AST_MAX_EXTENSION];
 	struct ast_format_cap *cap_all_audio = NULL;
 	struct ast_format_cap *cap_request;
-	struct ast_assigned_ids assignedids = {channel->assignedid1, channel->assignedid2};
+	struct ast_assigned_ids assignedids = {
+		.uniqueid = channel->assignedid1,
+		.uniqueid2 = channel->assignedid2,
+	};
 
 	/* Copy device string over */
 	ast_copy_string(numsubst, channel->device, sizeof(numsubst));
@@ -474,14 +476,10 @@ static int handle_call_forward(struct ast_dial *dial, struct ast_dial_channel *c
 	/* Drop old destination information */
 	ast_free(channel->tech);
 	ast_free(channel->device);
-	if (channel->assignedid1) {
-		ast_free(channel->assignedid1);
-		channel->assignedid1 = NULL;
-	}
-	if (channel->assignedid2) {
-		ast_free(channel->assignedid2);
-		channel->assignedid2 = NULL;
-	}
+	ast_free(channel->assignedid1);
+	channel->assignedid1 = NULL;
+	ast_free(channel->assignedid2);
+	channel->assignedid2 = NULL;
 
 	/* Update the dial channel with the new destination information */
 	channel->tech = ast_strdup(tech);
@@ -1066,12 +1064,8 @@ int ast_dial_destroy(struct ast_dial *dial)
 		/* Free structure */
 		ast_free(channel->tech);
 		ast_free(channel->device);
-		if (channel->assignedid1) {
-			ast_free(channel->assignedid1);
-		}
-		if (channel->assignedid2) {
-			ast_free(channel->assignedid2);
-		}
+		ast_free(channel->assignedid1);
+		ast_free(channel->assignedid2);
 
 		AST_LIST_REMOVE_CURRENT(list);
 		ast_free(channel);