Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
girara
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pwmt
girara
Commits
5618e036
Commit
5618e036
authored
Apr 26, 2019
by
Sebastian Ramacher
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a mutex to detect recursive use of feedkeys (fixes
#5
)
parent
c888c93b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
girara/internal.h
girara/internal.h
+2
-0
girara/session.c
girara/session.c
+4
-0
girara/shortcuts.c
girara/shortcuts.c
+8
-1
No files found.
girara/internal.h
View file @
5618e036
...
...
@@ -296,6 +296,8 @@ struct girara_session_private_s
girara_list_t
*
shortcut_mappings
;
girara_list_t
*
argument_mappings
;
}
config
;
GMutex
feedkeys_mutex
;
};
#endif
girara/session.c
View file @
5618e036
...
...
@@ -314,6 +314,7 @@ girara_session_create(void)
session_private
->
elements
.
statusbar_items
=
girara_list_new2
(
(
girara_free_function_t
)
girara_statusbar_item_free
);
g_mutex_init
(
&
session_private
->
feedkeys_mutex
);
/* settings */
session_private
->
settings
=
girara_sorted_list_new2
(
...
...
@@ -612,6 +613,9 @@ girara_session_private_free(girara_session_private_t* session)
girara_list_free
(
session
->
settings
);
session
->
settings
=
NULL
;
/* clean up mutex */
g_mutex_clear
(
&
session
->
feedkeys_mutex
);
g_slice_free
(
girara_session_private_t
,
session
);
}
...
...
girara/shortcuts.c
View file @
5618e036
...
...
@@ -5,6 +5,7 @@
#include "datastructures.h"
#include "input-history.h"
#include "internal.h"
#include "log.h"
#include "session.h"
#include "settings.h"
...
...
@@ -523,6 +524,11 @@ girara_sc_feedkeys(girara_session_t* session, girara_argument_t* argument,
return
false
;
}
if
(
g_mutex_trylock
(
&
session
->
private_data
->
feedkeys_mutex
)
==
FALSE
)
{
girara_error
(
"Recursive use of feedkeys detected. Aborting evaluation."
);
return
false
;
}
typedef
struct
gdk_keyboard_button_s
{
char
*
identifier
;
int
keyval
;
...
...
@@ -575,7 +581,7 @@ girara_sc_feedkeys(girara_session_t* session, girara_argument_t* argument,
goto
single_key
;
}
int
length
=
end
-
(
input
+
i
)
-
1
;
const
int
length
=
end
-
(
input
+
i
)
-
1
;
char
*
tmp
=
g_strndup
(
input
+
i
+
1
,
length
);
bool
found
=
false
;
...
...
@@ -633,6 +639,7 @@ single_key:
}
}
g_mutex_unlock
(
&
session
->
private_data
->
feedkeys_mutex
);
return
true
;
}
...
...
Sebastian Ramacher
@sebastinas
mentioned in issue
#5 (closed)
·
Apr 26, 2019
mentioned in issue
#5 (closed)
mentioned in issue #5
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment