dvbinfo: check optarg

708ed766 · Jean-Paul Saman · 9ee8155e · 708ed766
Commit 708ed766 authored Dec 24, 2014 by Jean-Paul Saman
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 6 deletions

examples/dvbinfo/dvbinfo.c examples/dvbinfo/dvbinfo.c +9 -6

No files found.
--- a/examples/dvbinfo/dvbinfo.c
+++ b/examples/dvbinfo/dvbinfo.c
@@ -609,13 +609,16 @@ int main(int argc, char **pp_argv)
            /* - tuning options - */
            case 'c':
-                param->threshold = strtoul(optarg, NULL, 10);
+                if (optarg)
-                if (((errno == ERANGE) && (param->threshold == ULONG_MAX)) ||
-                    ((errno != 0) && (param->threshold == 0)))
                {
-                    fprintf(stderr, "Option --capturesize has invalid content %s\n", optarg);
+                    param->threshold = strtoul(optarg, NULL, 10);
-                    params_free(param);
+                    if (((errno == ERANGE) && (param->threshold == ULONG_MAX)) ||
-                    usage();
+                        ((errno != 0) && (param->threshold == 0)))
+                    {
+                        fprintf(stderr, "Option --capturesize has invalid content %s\n", optarg);
+                        params_free(param);
+                        usage();
+                    }
                }
                break;