commit 40f54db094ab39b318c786d16b1f1f5b56ac8ebd
author Dominik Laskowski <domlaskowski@google.com> Thu Nov 09 16:00:05 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 09 16:00:05 2023 +0000
tree 8ebe6818fceaa1c573dd1b44a06db5e4c0d9c1a2
parent 6acd07f545afd557ff90410b0c10a3b67f40c3ca
parent d8dc5b3f8af19d4f628843a89e158167b02f7c9d

Merge "screencap: Fix parsing of display IDs" into main

cmds/screencap/screencap.cpp

diff --git a/cmds/screencap/screencap.cpp b/cmds/screencap/screencap.cpp
index ee9c464..2d23533 100644
--- a/cmds/screencap/screencap.cpp
+++ b/cmds/screencap/screencap.cpp
@@ -142,13 +142,22 @@
             case 'p':
                 png = true;
                 break;
-            case 'd':
-                displayIdOpt = DisplayId::fromValue(atoll(optarg));
+            case 'd': {
+                errno = 0;
+                char* end = nullptr;
+                const uint64_t id = strtoull(optarg, &end, 10);
+                if (!end || *end != '\0' || errno == ERANGE) {
+                    fprintf(stderr, "Invalid display ID: Out of range [0, 2^64).\n");
+                    return 1;
+                }
+
+                displayIdOpt = DisplayId::fromValue(id);
                 if (!displayIdOpt) {
-                    fprintf(stderr, "Invalid display ID: %s\n", optarg);
+                    fprintf(stderr, "Invalid display ID: Incorrect encoding.\n");
                     return 1;
                 }
                 break;
+            }
             case '?':
             case 'h':
                 if (ids.size() == 1) {