Skip to content

fix segfault on conversion error #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rogpeppe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix segfault on conversion error #117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions xclip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ doOptMain(int argc, char *argv[])
fil_number++;
}

/* If filenames were given on the command line,
/* If filenames were given on the command line,
* default to reading input (unless -o was used).
*/
if (fil_number > 0) {
Expand Down Expand Up @@ -745,7 +745,6 @@ doOut(Window win)
/* Clear memory buffer */
xcmemzero(sel_buf,sel_len);
}
free(sel_buf);
errconvsel(dpy, target, sseln);
// errconvsel does not return but exits with EXIT_FAILURE
}
Expand Down Expand Up @@ -937,7 +936,7 @@ main(int argc, char *argv[])
sizeof(opt_tab) / sizeof(opt_tab[0]), opt_tab_size);
return EXIT_FAILURE;
}


/* parse command line options */
doOptMain(argc, argv);
Expand Down