From 43fa1274263f76faaca995f6e498bc3179a857b8 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 31 Oct 2011 22:17:35 -0700 Subject: Remove bad code from DoShowOptions (Xorg -showopts handler) When we want to print a string, it's okay to just print it. We don't need to first allocate a buffer 2 bytes bigger than the string, copy the entire string unmodified to the buffer, print the buffer, and then leak the buffer (though we AbortDDX 8 lines later, and then just in case we survived that, call exit as well, so the leak is short lived, just oh so pointless). Signed-off-by: Alan Coopersmith Reviewed-by: Daniel Stone Reviewed-by: Jeremy Huddleston --- hw/xfree86/common/xf86ShowOpts.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/hw/xfree86/common/xf86ShowOpts.c b/hw/xfree86/common/xf86ShowOpts.c index a8059168d..a919013bb 100644 --- a/hw/xfree86/common/xf86ShowOpts.c +++ b/hw/xfree86/common/xf86ShowOpts.c @@ -107,16 +107,8 @@ void DoShowOptions (void) { i,xf86DriverList[i]->driverName,vers->vendor ); for (p = pOption; p->name != NULL; p++) { - const char *opttype = optionTypeToSting(p->type); - /* XXX: Why overallocate by 2 bytes? - * Otherwise, this would be strdup() - */ - char *optname = malloc(strlen(p->name) + 2 + 1); - if (!optname) { - continue; - } - sprintf(optname, "%s", p->name); - ErrorF ("\t%s:%s\n", optname,opttype); + ErrorF ("\t%s:%s\n", p->name, + optionTypeToSting(p->type)); } ErrorF ("}\n"); } -- cgit v1.2.3