pjht/swaylock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle alloc failures.

Browse Source
This commit is contained in:
Connor E 2019-01-18 13:45:34 +00:00
parent 291bae1e44
commit 7c0ba89197
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main.c
View File

@ -937,6 +937,12 @@ static int load_config(char *path, struct swaylock_state *state,
swaylock_log(LOG_DEBUG, "Config Line #%d: %s", line_number, line); swaylock_log(LOG_DEBUG, "Config Line #%d: %s", line_number, line);
char *flag = malloc(nread + 3); char *flag = malloc(nread + 3);
if (flag == NULL) {
free(line);
free(config);
swaylock_log(LOG_ERROR, "Failed to allocate memory");
return 0;
}
sprintf(flag, "--%s", line); sprintf(flag, "--%s", line);
char *argv[] = {"swaylock", flag}; char *argv[] = {"swaylock", flag};
result = parse_options(2, argv, state, line_mode, NULL); result = parse_options(2, argv, state, line_mode, NULL);

8
pango.c
View File

@ -94,6 +94,10 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
int *baseline, double scale, bool markup, const char *fmt, ...) { int *baseline, double scale, bool markup, const char *fmt, ...) {
char *buf = malloc(max_chars); char *buf = malloc(max_chars);
if (buf == NULL) {
swaylock_log(LOG_ERROR, "Failed to allocate memory");
return;
}
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
@ -116,6 +120,10 @@ void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
void pango_printf(cairo_t *cairo, const char *font, void pango_printf(cairo_t *cairo, const char *font,
double scale, bool markup, const char *fmt, ...) { double scale, bool markup, const char *fmt, ...) {
char *buf = malloc(max_chars); char *buf = malloc(max_chars);
if (buf == NULL) {
swaylock_log(LOG_ERROR, "Failed to allocate memory");
return;
}
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);