Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd8e1bbb authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am 8d57b79c: am bf66e448: am a1551e9b: Merge "Fix buffer overflow in syren utility" 

* commit '8d57b79c':
  Fix buffer overflow in syren utility
parents 02c9460a 8d57b79c

toolbox/syren.c

+6 −2
Original line number Diff line number Diff line
@@ -123,7 +123,11 @@ syren_main(int argc, char **argv) 


	r = find_reg(argv[2]);

	if (r == NULL) {

		strcpy(name, argv[2]);

		if(strlen(argv[2]) >= sizeof(name)){

			fprintf(stderr, "REGNAME too long\n");

			return 0;

		}

		strlcpy(name, argv[2], sizeof(name));

		char *addr_str = strchr(argv[2], ':');

		if (addr_str == NULL)

			return usage();
@@ -131,7 +135,7 @@ syren_main(int argc, char **argv) 
		sio.page = strtoul(argv[2], 0, 0);

		sio.addr = strtoul(addr_str, 0, 0);

	} else {

		strcpy(name, r->name);

		strlcpy(name, r->name, sizeof(name));

		sio.page = r->page;

		sio.addr = r->addr;

	}