From: Sean Bright <sean@malleable.com>
Date: Thu, 13 Dec 2012 21:20:32 +0000 (+0000)
Subject: Make generate_exchange_uuid() always return the passed ast_str pointer.
X-Git-Tag: 13.0.0-beta1~2268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e51b9eaa1eda32ea1135ff1df268d5c3908c0f3;p=thirdparty%2Fasterisk.git

Make generate_exchange_uuid() always return the passed ast_str pointer.

I changed this code earlier to return NULL if it wasn't able to generate a UUID,
whereas the earlier code would always return the ast_str that was passed in.
Switch back to returning the ast_str, only set it to the empty string instead if
UUID generation fails.  We still do a validity check later which will catch this
and blow up if necessary.


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

diff --git a/res/res_calendar_exchange.c b/res/res_calendar_exchange.c
index dda4414be0..ff711c5413 100644
--- a/res/res_calendar_exchange.c
+++ b/res/res_calendar_exchange.c
@@ -246,7 +246,8 @@ static struct ast_str *generate_exchange_uuid(struct ast_str *uid)
 	struct ast_uuid *uuid = ast_uuid_generate();
 
 	if (!uuid) {
-		return NULL;
+		ast_str_set(&uid, 0, "%s", "");
+		return uid;
 	}
 
 	ast_str_set(&uid, 0, "%s", ast_uuid_to_str(uuid, buffer, AST_UUID_STR_LEN));