mp3dec: Improve bad main_data_begin pointer error handling.

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index 1ca54da90191fd270c98b3001d16a4b5f5c04c53..f61ea57220d2be440728883564734e460f4c110c 100644 (file)
--- a/command.c
+++ b/command.c
@@ -185,17 +185,9 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman
                break;
        case SENDER_DENY:
        case SENDER_ALLOW:
-               if (argc != 4 && argc != 5)
+               if (argc != 4 || parse_cidr(argv[3], scd->host,
+                               sizeof(scd->host), &scd->netmask) == NULL)
                        return -E_COMMAND_SYNTAX;
-               if (!is_valid_ipv4_address(argv[3]))
-                       return -E_COMMAND_SYNTAX;
-               scd->netmask = 32;
-               if (argc == 5) {
-                       scd->netmask = atoi(argv[4]);
-                       if (scd->netmask < 0 || scd->netmask > 32)
-                               return -E_COMMAND_SYNTAX;
-               }
-               strncpy(scd->host, argv[3], sizeof(scd->host));
                break;
        case SENDER_ADD:
        case SENDER_DELETE:
@@ -315,8 +307,13 @@ int com_stat(int fd, int argc, char * const * argv)
 
        para_sigaction(SIGUSR1, dummy);
 
-       if (argc > 1)
-               num = atoi(argv[1]);
+       if (argc > 2)
+               return -E_COMMAND_SYNTAX;
+       if (argc > 1) {
+               ret = para_atoi32(argv[1], &num);
+               if (ret < 0)
+                       goto out;
+       }
        for (;;) {
 
                mmd_dup(nmmd);