mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 17:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #634 from 1ace/fix/log-double-close

Browse source 
Fix double-close in error_handler()
This commit is contained in:
Drew DeVault 2016-05-02 13:09:28 -04:00
parent 70ca8b6041 f53ddbe800
commit 8a6b64e471
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/log.c
View file

@ -145,7 +145,6 @@ void error_handler(int sig) {
size_t bt_len; size_t bt_len;
char maps_file[256]; char maps_file[256];
char maps_buffer[1024]; char maps_buffer[1024];
FILE *maps;
sway_log(L_ERROR, "Error: Signal %d. Printing backtrace", sig); sway_log(L_ERROR, "Error: Signal %d. Printing backtrace", sig);
bt_len = backtrace(array, max_lines); bt_len = backtrace(array, max_lines);
@ -163,11 +162,10 @@ void error_handler(int sig) {
sway_log(L_ERROR, "Maps:"); sway_log(L_ERROR, "Maps:");
pid_t pid = getpid(); pid_t pid = getpid();
if (snprintf(maps_file, 255, "/proc/%zd/maps", (size_t)pid) < 255) { if (snprintf(maps_file, 255, "/proc/%zd/maps", (size_t)pid) < 255) {
maps = fopen(maps_file, "r"); FILE *maps = fopen(maps_file, "r");
while (!feof(maps)) { while (!feof(maps)) {
char *m = read_line_buffer(maps, maps_buffer, 1024); char *m = read_line_buffer(maps, maps_buffer, 1024);
if (!m) { if (!m) {
fclose(maps);
sway_log(L_ERROR, "Unable to allocate memory to show maps"); sway_log(L_ERROR, "Unable to allocate memory to show maps");
break; break;
} }