Permalink
Browse files

am f7ca604: Fix infinite loop in init when debugging is turned off

* commit 'f7ca6040616f672a6f0039d55e39c610b7c1cf91':
  Fix infinite loop in init when debugging is turned off
  • Loading branch information...
2 parents f1c2a73 + f7ca604 commit bf10797e538f9fa252d72710bd5ecf0ef1f6f3e0 @colincross colincross committed with Android Git Automerger Jan 5, 2011
Showing with 6 additions and 6 deletions.
  1. +6 −6 init/keychords.c
View
12 init/keychords.c
@@ -103,14 +103,14 @@ void handle_keychord()
// and on user builds for users that are developers.
debuggable = property_get("ro.debuggable");
adb_enabled = property_get("init.svc.adbd");
+ ret = read(keychord_fd, &id, sizeof(id));
+ if (ret != sizeof(id)) {
+ ERROR("could not read keychord id\n");
+ return;
+ }
+
if ((debuggable && !strcmp(debuggable, "1")) ||
(adb_enabled && !strcmp(adb_enabled, "running"))) {
- ret = read(keychord_fd, &id, sizeof(id));
- if (ret != sizeof(id)) {
- ERROR("could not read keychord id\n");
- return;
- }
-
svc = service_find_by_keychord(id);
if (svc) {
INFO("starting service %s from keychord\n", svc->name);

0 comments on commit bf10797

Please sign in to comment.