mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

Fix a crash that could occur if any of the keyboard layouts had variants

Browse Source 
(e.g. jp(latin) where latin the the variant of jp).  The problem was a bad
use of realloc.  Thanks to jasone for explaining the problem with the existing
code.

Reported by:	bland
This commit is contained in:
Joe Marcus Clarke 2006-04-03 21:30:10 +00:00
parent 8ccaebee97
commit deb4736ca2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=158743
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
x11/libxklavier/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= libxklavier
PORTVERSION= 2.2
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME}

13
x11/libxklavier/files/patch-libxklavier_xklavier_props.c Normal file
View File

@ -0,0 +1,13 @@
--- libxklavier/xklavier_props.c.orig Mon Apr 3 14:49:17 2006
+++ libxklavier/xklavier_props.c Mon Apr 3 17:16:13 2006
@@ -319,7 +324,9 @@ Bool XklGetNamesProp( Atom rulesAtom,
memcpy( var, varstart + 1, --varlen );
var[varlen] = '\0';
- ( (char*)realloc( *theLayout, laylen + 1 ) )[laylen] = '\0';
+ *theLayout = realloc (*theLayout, laylen + 1);
+ (*theLayout)[laylen] = '\0';
+ /*( (char*)realloc( *theLayout, laylen + 1 ) )[laylen] = '\0';*/
}
}
}