automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8202 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 40cfb616e905dc4839e0183b4c95034e47f0865a..45a738fa28ee25080522a483dbfd2257427a51f8 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1630,7 +1630,8 @@ static struct ast_conference *find_conf(struct ast_channel *chan, char *confno,
                        if (dynamic_pin) {
                                if (dynamic_pin[0] == 'q') {
                                        /* Query the user to enter a PIN */
-                                       ast_app_getdata(chan, "conf-getpin", dynamic_pin, AST_MAX_EXTENSION - 1, 0);
+                                       if (ast_app_getdata(chan, "conf-getpin", dynamic_pin, AST_MAX_EXTENSION - 1, 0) < 0)
+                                               return NULL;
                                }
                                cnf = build_conf(confno, dynamic_pin, "", make, dynamic);
                        } else {