diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index c2f94ed04..2d3411cfc 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -252,7 +252,7 @@ hostx_get_output_geometry(const char *output, /* First of all, check for extension */ if (!hostx_has_extension(&xcb_randr_id)) { - fprintf(stderr, "\nHost X server does not support RANDR extension (or it's disabled).\n"); + (void) fprintf(stderr, "\nHost X server does not support RANDR extension (or it's disabled).\n"); exit(1); } @@ -264,13 +264,13 @@ hostx_get_output_geometry(const char *output, if (error != NULL || version_r == NULL) { - fprintf(stderr, "\nFailed to get RandR version supported by host X server.\n"); + (void) fprintf(stderr, "\nFailed to get RandR version supported by host X server.\n"); exit(1); } else if (version_r->major_version < 1 || version_r->minor_version < 2) { free(version_r); - fprintf(stderr, "\nHost X server doesn't support RandR 1.2, needed for -output usage.\n"); + (void) fprintf(stderr, "\nHost X server doesn't support RandR 1.2, needed for -output usage.\n"); exit(1); } @@ -297,6 +297,12 @@ hostx_get_output_geometry(const char *output, /* Get output name */ name_len = xcb_randr_get_output_info_name_length(output_info_r); name = malloc(name_len + 1); + if (!name) + { + perror(NULL); + goto free_output_info; + } + strncpy(name, (char*)xcb_randr_get_output_info_name(output_info_r), name_len); name[name_len] = '\0'; @@ -308,9 +314,12 @@ hostx_get_output_geometry(const char *output, if (output_info_r->crtc == XCB_NONE) { free(name); + (void) fprintf(stderr, + "\nOutput %s is currently disabled (or not connected).\n", + output); +free_output_info: free(output_info_r); free(screen_resources_r); - fprintf(stderr, "\nOutput %s is currently disabled (or not connected).\n", output); exit(1); } @@ -339,7 +348,7 @@ hostx_get_output_geometry(const char *output, if (!output_found) { - fprintf(stderr, "\nOutput %s not available in host X server.\n", output); + (void) fprintf(stderr, "\nOutput %s not available in host X server.\n", output); exit(1); } }