build tweaks

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8897 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/switch_ivr_async.c b/src/switch_ivr_async.c
index e7f9021596f64926b8c2c05943cb6a33ff89465a..2d2924e18aba99226c7f8f79673be552f254010a 100644 (file)
--- a/src/switch_ivr_async.c
+++ b/src/switch_ivr_async.c
@@ -544,7 +544,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session
                        if ( (argc = switch_separate_string(data, ',', argv, (sizeof(argv) / sizeof(argv[0])))) ) {
                                for ( i = 0; i < argc; i++ ) {
                                        /* If one of the group matches, then ok */
-                                       if ( !strcmp(argv[i], require_group)) {
+                                       if (argv[i] && !strcmp(argv[i], require_group)) {
                                                ok = 1;
                                        }
                                }

diff --git a/src/switch_utils.c b/src/switch_utils.c
index 498ba6746953e50910416d412726633ad0cfb1bf..3f7d4df720a7d651af308b73528b5a0bd1e4ad21 100644 (file)
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -1097,8 +1097,7 @@ SWITCH_DECLARE(int) switch_build_uri(char *uri,
        }
 
        if (getnameinfo(addr, sa->salen, host, sizeof(host), serv, sizeof(serv),
-               (flags & SWITCH_URI_NUMERIC_HOST) ? NI_NUMERICHOST : 0 |
-               (flags & SWITCH_URI_NUMERIC_PORT) ? NI_NUMERICSERV : 0) != 0) {
+               ((flags & SWITCH_URI_NUMERIC_HOST) ? NI_NUMERICHOST : 0) | ((flags & SWITCH_URI_NUMERIC_PORT) ? NI_NUMERICSERV : 0)) != 0) {
                        return 0;
        }