Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
2674ddc8
Commit
2674ddc8
authored
Jun 21, 2011
by
Paul Eggert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* xsettings.c (Ffont_get_system_normal_font, Ffont_get_system_font): Avoid need for strlen.
parent
aaafe47a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
src/ChangeLog
src/ChangeLog
+1
-0
src/xsettings.c
src/xsettings.c
+2
-6
No files found.
src/ChangeLog
View file @
2674ddc8
...
...
@@ -3,6 +3,7 @@
* xsettings.c (apply_xft_settings): Fix potential buffer overrun.
This is unlikely, but can occur if DPI is outlandish.
* xsettings.c (Ffont_get_system_normal_font, Ffont_get_system_font):
* xselect.c (Fx_get_atom_name): Avoid need for strlen.
* xrdb.c: Don't assume strlen fits in int; avoid some strlens.
...
...
src/xsettings.c
View file @
2674ddc8
...
...
@@ -711,9 +711,7 @@ DEFUN ("font-get-system-normal-font", Ffont_get_system_normal_font,
doc
:
/* Get the system default application font. */
)
(
void
)
{
return
current_font
?
make_string
(
current_font
,
strlen
(
current_font
))
:
Qnil
;
return
current_font
?
build_string
(
current_font
)
:
Qnil
;
}
DEFUN
(
"font-get-system-font"
,
Ffont_get_system_font
,
Sfont_get_system_font
,
...
...
@@ -721,9 +719,7 @@ DEFUN ("font-get-system-font", Ffont_get_system_font, Sfont_get_system_font,
doc
:
/* Get the system default fixed width font. */
)
(
void
)
{
return
current_mono_font
?
make_string
(
current_mono_font
,
strlen
(
current_mono_font
))
:
Qnil
;
return
current_mono_font
?
build_string
(
current_mono_font
)
:
Qnil
;
}
DEFUN
(
"tool-bar-get-system-style"
,
Ftool_bar_get_system_style
,
...
...
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