Skip to content

slock.c: Dont segfault when $HOME is unset #5

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
su8 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

slock.c: Dont segfault when $HOME is unset #5

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
35 changes: 18 additions & 17 deletions slock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,8 @@ imgur_upload(char **link, char **hash) {
*hash = NULL;

#if IMGUR_UPLOAD
const char *HOME = getenv("HOME");
static const char *const HOME = getenv("HOME");
static const char *const HOME2 = HOME ? HOME : "";
char cmd[CMD_LENGTH];
int r;

Expand All @@ -335,8 +336,8 @@ imgur_upload(char **link, char **hash) {
" -H 'Authorization: Client-ID " IMGUR_CLIENT "'"
" -F 'image=@%s/slock.jpg'"
" 'https://api.imgur.com/3/image' > %s/slock_imgur.curl",
HOME,
HOME
HOME2,
HOME2
);

if (r < 0 || r >= CMD_LENGTH)
Expand All @@ -353,8 +354,8 @@ imgur_upload(char **link, char **hash) {
" | sed 's/\\\\//g'"
" | grep -o '[^\"]\\+$'"
" > %s/slock_imgur.link",
HOME,
HOME
HOME2,
HOME2
);

if (r < 0 || r >= CMD_LENGTH)
Expand All @@ -370,41 +371,41 @@ imgur_upload(char **link, char **hash) {
" | grep -o '\"deletehash\":\"[^\"]\\+'"
" | grep -o '[^\"]\\+$'"
" > %s/slock_imgur.hash",
HOME,
HOME
HOME2,
HOME2
);

if (r < 0 || r >= CMD_LENGTH)
goto cleanup;

system(cmd);

r = snprintf(cmd, CMD_LENGTH, "%s/slock_imgur.link", HOME);
r = snprintf(cmd, CMD_LENGTH, "%s/slock_imgur.link", HOME2);

if (r < 0 || r >= CMD_LENGTH)
goto cleanup;

*link = read_file(cmd);

r = snprintf(cmd, CMD_LENGTH, "%s/slock_imgur.hash", HOME);
r = snprintf(cmd, CMD_LENGTH, "%s/slock_imgur.hash", HOME2);

if (r < 0 || r >= CMD_LENGTH)
goto cleanup;

*hash = read_file(cmd);

cleanup:
r = snprintf(cmd, CMD_LENGTH, "%s/slock_imgur.curl", HOME);
r = snprintf(cmd, CMD_LENGTH, "%s/slock_imgur.curl", HOME2);

if (r >= 0 && r < CMD_LENGTH)
unlink(cmd);

r = snprintf(cmd, CMD_LENGTH, "%s/slock_imgur.link", HOME);
r = snprintf(cmd, CMD_LENGTH, "%s/slock_imgur.link", HOME2);

if (r >= 0 && r < CMD_LENGTH)
unlink(cmd);

r = snprintf(cmd, CMD_LENGTH, "%s/slock_imgur.hash", HOME);
r = snprintf(cmd, CMD_LENGTH, "%s/slock_imgur.hash", HOME2);

if (r >= 0 && r < CMD_LENGTH)
unlink(cmd);
Expand Down Expand Up @@ -459,7 +460,7 @@ play_beep(int async) {
cmd,
CMD_LENGTH,
"aplay %s/slock/beep.wav 2> /dev/null%s",
getenv("HOME"),
getenv("HOME") ? getenv("HOME") : "",
async ? " &" : ""
);

Expand All @@ -481,7 +482,7 @@ play_alarm(int async) {
cmd,
CMD_LENGTH,
"aplay %s/slock/police.wav 2> /dev/null%s",
getenv("HOME"),
getenv("HOME") ? getenv("HOME") : "",
async ? " &" : ""
);

Expand Down Expand Up @@ -676,7 +677,7 @@ readpw(Display *dpy, const char *pws)
break;
}
default: {
if (num && !iscntrl((int)buf[0]) && (len + num < sizeof(passwd))) {
if (num && !iscntrl((unsigned char)buf[0]) && (len + num < sizeof(passwd))) {
memcpy(passwd + len, buf, num);
len += num;
}
Expand Down Expand Up @@ -915,7 +916,7 @@ read_pw_file(void) {
name,
sizeof(name),
"%s/.slock_passwd",
getenv("HOME")
getenv("HOME") ? getenv("HOME") : ""
);

if (r < 0 || r >= sizeof(name))
Expand All @@ -940,7 +941,7 @@ main(int argc, char **argv) {
g_pw = read_pw_file();

if ((argc >= 2) && strcmp(argv[1], "-v") == 0) {
die("slock-%s, © 2006-2012 Anselm R Garbe\n", VERSION);
die("slock-%s, © 2006-2018 Anselm R Garbe\n", VERSION);
} else if (argc != 1) {
usage();
}
Expand Down