]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
fs_cli: fix segfault if a pressed function key is not bound
authorTravis Cross <tc@traviscross.com>
Thu, 22 Sep 2011 03:20:56 +0000 (03:20 +0000)
committerTravis Cross <tc@traviscross.com>
Fri, 23 Sep 2011 01:25:42 +0000 (01:25 +0000)
libs/esl/fs_cli.c

index 5a68640633ff3d81045940935140df4d8568163c..f9d77f9da4047d4b956e2692ba68222065c544aa 100644 (file)
@@ -100,12 +100,12 @@ static unsigned char console_fnkey_pressed(int i)
 {
        const char *c;
        assert((i > 0) && (i <= 12));
-       c = global_profile->console_fnkeys[i - 1];
-       printf("%s\n", c);
-       if (c == NULL) {
+       if (!(c = global_profile->console_fnkeys[i - 1])) {
+               printf("\n");
                esl_log(ESL_LOG_ERROR, "FUNCTION KEY F%d IS NOT BOUND, please edit your config.\n", i);
                return CC_REDISPLAY;
        }
+       printf("%s\n", c);
        if (process_command(global_handle, c)) {
                running = thread_running = 0;
        }