ARI: Fixed crash that occurred when updating a bridge when the optional query paramet...
authorAshley Sanders <asanders@digium.com>
Tue, 20 Jan 2015 17:15:54 +0000 (17:15 +0000)
committerAshley Sanders <asanders@digium.com>
Tue, 20 Jan 2015 17:15:54 +0000 (17:15 +0000)
Prior to this changeset, posting to the: /ari/bridges/{bridgeId} endpoint without specifying a value for the [name] query parameter, would crash Asterisk if the bridge you are attempting to create (or update) had the same ID as an existing bridge. The internal mechanism of the POST operation interpreted a null value for name, thus resulting in an error condition that crashed Asterisk.

ASTERISK-24560 #close
Reported By: Kinsey Moore

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

Merged revisions 430818 from http://svn.asterisk.org/svn/asterisk/branches/13

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

res/ari/resource_bridges.c

index 45fa09d..2dfb1cf 100644 (file)
@@ -949,16 +949,18 @@ void ast_ari_bridges_create_or_update_with_id(struct ast_variable *headers,
 
        if (bridge) {
                /* update */
-               if (strcmp(args->name, bridge->name)) {
-                       ast_ari_response_error(
-                               response, 500, "Internal Error",
-                               "Changing bridge name is not implemented");
-                       return;
+               if (!ast_strlen_zero(args->name)) {
+                       if (!strcmp(args->name, bridge->name)) {
+                               ast_ari_response_error(
+                                       response, 500, "Internal Error",
+                                       "Changing bridge name is not implemented");
+                               return;
+                       }
                }
                if (!ast_strlen_zero(args->type)) {
                        ast_ari_response_error(
                                response, 500, "Internal Error",
-                               "Changing bridge type is not implemented");
+                               "Supplying a bridge type when updating a bridge is not allowed.");
                        return;
                }
                ast_ari_response_ok(response,