This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository mednaffe.
commit 87106a7c73e7dfdb404d6207ecfc1b359c90e0a0 Author: Stephen Kitt <[email protected]> Date: Sun Aug 20 22:46:52 2017 +0200 New upstream version 0.8.6 --- ChangeLog | 7 +++++ Makefile.in | 4 +-- README | 2 +- README.md | 2 +- aclocal.m4 | 60 ++++++++++++++++++++-------------------- compile | 9 +++--- configure | 36 ++++++++++++------------ configure.ac | 2 +- depcomp | 6 ++-- install-sh | 4 +-- missing | 6 ++-- share/Makefile.in | 4 +-- share/win/ChangeLog_Mednaffe.txt | 7 +++++ share/win/README_WINDOWS.txt | 2 +- share/win/mednaffe.rc | 8 +++--- src/Makefile.in | 4 +-- src/about.c | 2 +- src/input.c | 16 +++++++---- src/input.h | 2 +- src/prefs.c | 2 +- src/toggles.c | 2 +- 21 files changed, 103 insertions(+), 84 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c29b96..754ec13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +#### 29 / Jul / 2017 + +Mednaffe 0.8.6 is released with the following changes: + +- Add checks to avoid access array out of bounds (It cause a segfault + when configuring some keys) + #### 14 / Feb / 2017 Mednaffe 0.8.5 is released with the following changes: diff --git a/Makefile.in b/Makefile.in index 6b81a93..802b46a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/README b/README index 7ead6a0..52bd077 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ Its main features are: * The only dependency is GTK+2 (or GTK+3). * GPLv3 licensed. -*Note: Mednaffe only works with 0.9.39.1 or higher versions of mednafen emulator.* +*Note: Mednaffe only works with 0.9.41 or higher versions of mednafen emulator.* ## Building mednaffe on Linux diff --git a/README.md b/README.md index 1521553..d9b64d8 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Its main features are: * The only dependency (on Linux) is GTK+2 (or GTK+3). * GPLv3 licensed. -#### Downloads - Version 0.8.5 +#### Downloads - Version 0.8.6 * You can download Mednaffe [here](https://sites.google.com/site/amatcoder/mednaffe/downloads/ "Downloads"). * You can see the changelog [here](https://github.com/AmatCoder/mednaffe/blob/master/ChangeLog "ChangeLog"). diff --git a/aclocal.m4 b/aclocal.m4 index 9ecb44e..2161831 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,9 +20,9 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + dnl Copyright © 2004 Scott James Remnant <[email protected]>. dnl Copyright © 2012-2015 Dan Nicholson <[email protected]> dnl @@ -63,7 +63,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -174,11 +174,11 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -195,7 +195,7 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -296,7 +296,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -311,7 +311,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -327,14 +327,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -386,7 +386,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -417,7 +417,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -608,7 +608,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -684,7 +684,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -881,7 +881,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -902,7 +902,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -923,7 +923,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -973,7 +973,7 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1012,7 +1012,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1041,7 +1041,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1088,7 +1088,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1107,7 +1107,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1188,7 +1188,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1248,7 +1248,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1276,7 +1276,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1295,7 +1295,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/compile b/compile index a85b723..2ab71e4 100755 --- a/compile +++ b/compile @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -255,7 +255,8 @@ EOF echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -342,6 +343,6 @@ exit $ret # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/configure b/configure index 1bca6f6..1632db6 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for mednaffe 0.8.5. +# Generated by GNU Autoconf 2.69 for mednaffe 0.8.6. # # Report bugs to <BUG-REPORT-ADDRESS>. # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='mednaffe' PACKAGE_TARNAME='mednaffe' -PACKAGE_VERSION='0.8.5' -PACKAGE_STRING='mednaffe 0.8.5' +PACKAGE_VERSION='0.8.6' +PACKAGE_STRING='mednaffe 0.8.6' PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS' PACKAGE_URL='' @@ -1238,7 +1238,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mednaffe 0.8.5 to adapt to many kinds of systems. +\`configure' configures mednaffe 0.8.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1304,7 +1304,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mednaffe 0.8.5:";; + short | recursive ) echo "Configuration of mednaffe 0.8.6:";; esac cat <<\_ACEOF @@ -1402,7 +1402,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mednaffe configure 0.8.5 +mednaffe configure 0.8.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1457,7 +1457,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mednaffe $as_me 0.8.5, which was +It was created by mednaffe $as_me 0.8.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2320,7 +2320,7 @@ fi # Define the identity of the package. PACKAGE='mednaffe' - VERSION='0.8.5' + VERSION='0.8.6' cat >>confdefs.h <<_ACEOF @@ -3640,8 +3640,8 @@ fi if test "x$enable_gtk3" = xyes; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 -$as_echo_n "checking for GTK... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.4 glib-2.0 >= 2.32 gthread-2.0" >&5 +$as_echo_n "checking for gtk+-3.0 >= 3.4 glib-2.0 >= 2.32 gthread-2.0... " >&6; } if test -n "$GTK_CFLAGS"; then pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" @@ -3681,7 +3681,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -3699,7 +3699,7 @@ fi as_fn_error $? "Mednaffe needs GTK+ >= 3.4 development libraries" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? "Mednaffe needs GTK+ >= 3.4 development libraries" "$LINENO" 5 else @@ -3717,8 +3717,8 @@ $as_echo "#define GTK3_ENABLED 1" >>confdefs.h else pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 -$as_echo_n "checking for GTK... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.24 glib-2.0 >= 2.32 gthread-2.0" >&5 +$as_echo_n "checking for gtk+-2.0 >= 2.24 glib-2.0 >= 2.32 gthread-2.0... " >&6; } if test -n "$GTK_CFLAGS"; then pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" @@ -3758,7 +3758,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -3776,7 +3776,7 @@ fi as_fn_error $? "Mednaffe needs GTK+ >= 2.24 development libraries" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? "Mednaffe needs GTK+ >= 2.24 development libraries" "$LINENO" 5 else @@ -4327,7 +4327,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mednaffe $as_me 0.8.5, which was +This file was extended by mednaffe $as_me 0.8.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4393,7 +4393,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mednaffe config.status 0.8.5 +mednaffe config.status 0.8.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index f34ce96..fb49e40 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.68]) -AC_INIT([mednaffe], [0.8.5], [BUG-REPORT-ADDRESS]) +AC_INIT([mednaffe], [0.8.6], [BUG-REPORT-ADDRESS]) AM_INIT_AUTOMAKE([foreign -Wall -Werror]) AC_CONFIG_SRCDIR([src/common.h]) AC_CONFIG_HEADERS([config.h]) diff --git a/depcomp b/depcomp index fc98710..b39f98f 100755 --- a/depcomp +++ b/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -786,6 +786,6 @@ exit 0 # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/install-sh b/install-sh index 0b0fdcb..0360b79 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2013-12-25.23; # UTC +scriptversion=2016-01-11.22; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -496,6 +496,6 @@ done # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/missing b/missing index f62bbae..c6e3795 100755 --- a/missing +++ b/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -210,6 +210,6 @@ exit $st # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/share/Makefile.in b/share/Makefile.in index 9f6eedb..8c9f6cc 100644 --- a/share/Makefile.in +++ b/share/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/share/win/ChangeLog_Mednaffe.txt b/share/win/ChangeLog_Mednaffe.txt index eeb9236..a1b6688 100644 --- a/share/win/ChangeLog_Mednaffe.txt +++ b/share/win/ChangeLog_Mednaffe.txt @@ -1,3 +1,10 @@ +#### 29 / Jul / 2017 + +Mednaffe 0.8.6 is released with the following changes: + +- Add checks to avoid access array out of bounds (It cause a segfault + when configuring some keys) + #### 14 / Feb / 2017 Mednaffe 0.8.5 is released with the following changes: diff --git a/share/win/README_WINDOWS.txt b/share/win/README_WINDOWS.txt index 40b84ad..e450269 100644 --- a/share/win/README_WINDOWS.txt +++ b/share/win/README_WINDOWS.txt @@ -1,4 +1,4 @@ - README for Mednaffe 0.8.5 (Windows version) + README for Mednaffe 0.8.6 (Windows version) ------------------------------------------------------------------------------------------- Mednaffe is a front-end (GUI) for mednafen emulator. diff --git a/share/win/mednaffe.rc b/share/win/mednaffe.rc index ff67f23..dbb1818 100644 --- a/share/win/mednaffe.rc +++ b/share/win/mednaffe.rc @@ -1,21 +1,21 @@ 1 ICON "mednaffe.ico" 1 VERSIONINFO -FILEVERSION 0,8,5,0 -PRODUCTVERSION 0,8,5,0 +FILEVERSION 0,8,6,0 +PRODUCTVERSION 0,8,6,0 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904E4" BEGIN VALUE "FileDescription", "A front-end (GUI) for Mednafen emulator" - VALUE "FileVersion", "0.8.5" + VALUE "FileVersion", "0.8.6" VALUE "InternalName", "mednaffe" VALUE "LegalCopyright", "Copyright \251 2010-2017 AmatCoder" VALUE "LegalTrademarks", "Released under GPLv3" VALUE "OriginalFilename", "mednaffe.exe" VALUE "ProductName", "Mednaffe" - VALUE "ProductVersion", "0.8.5" + VALUE "ProductVersion", "0.8.6" END END diff --git a/src/Makefile.in b/src/Makefile.in index 75a8f2b..80e02b1 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/src/about.c b/src/about.c index a346c36..b4933a9 100644 --- a/src/about.c +++ b/src/about.c @@ -45,7 +45,7 @@ along with Mednaffe. If not, see <http://www.gnu.org/licenses/>."; gtk_show_about_dialog( GTK_WINDOW(gui->topwindow), "program-name", "Mednaffe", - "version" ,"0.8.5", + "version" ,"0.8.6", "authors", authors, #ifdef STATIC_ENABLED "copyright", "See NOTICE file for license details.", diff --git a/src/input.c b/src/input.c index f75fa40..bce9136 100644 --- a/src/input.c +++ b/src/input.c @@ -156,7 +156,7 @@ gchar* sdl2gdk(gchar *key) g_strfreev(item); g_strfreev(line); - if (sdl_value < 325) + if (sdl_value < 324) gdk_key = g_strdup(sdl_to_gdk[sdl_value]); else gdk_key = NULL; @@ -864,6 +864,7 @@ guint gdk_to_sdl_keyval(guint gdk_key) } if (gdk_key & 0xFFFF0000) return 0; + if ((gdk_key & 0xFF) > 323) return 0; guint sdl_key = gdk_to_sdl[gdk_key & 0xFF]; return sdl_key; @@ -904,6 +905,14 @@ gboolean editable_key_cb(GtkWidget *ed, GdkEventKey *event, guidata *gui) ) return FALSE; } + nkey = gdk_to_sdl_keyval(event->keyval); + + if (nkey > 323) return TRUE; + + if (sdl_to_gdk[nkey] != NULL) + key = g_strdup(sdl_to_gdk[nkey]);//g_ascii_strup(gdk_keyval_name(event->keyval), -1); + else return TRUE; + #ifdef G_OS_WIN32 g_mutex_lock (&mutex); if (bool==1) { @@ -913,11 +922,6 @@ gboolean editable_key_cb(GtkWidget *ed, GdkEventKey *event, guidata *gui) bool=1; #endif - nkey = gdk_to_sdl_keyval(event->keyval); - if (sdl_to_gdk[nkey] != NULL) - key = g_strdup(sdl_to_gdk[nkey]);//g_ascii_strup(gdk_keyval_name(event->keyval), -1); - else return TRUE; - model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtk_builder_get_object(gui->specific, "treeview_input"))); gtk_tree_model_get_iter_from_string(model, &iter, gui->treepath); diff --git a/src/input.h b/src/input.h index ef8b586..f768e8b 100644 --- a/src/input.h +++ b/src/input.h @@ -23,7 +23,7 @@ #ifndef INPUT_H #define INPUT_H -static const guint const gdk_to_sdl[256] = +static const guint gdk_to_sdl[256] = { 0, 0, 0, 0, 0, 0, 0, 0, 8, 9, 13, 12, 0, 13, 0, 0, 0, 0, 0, 19, 302, 317, 0, 0, 0, 0, 0, 27, 0, 0, 0, 0, diff --git a/src/prefs.c b/src/prefs.c index 4fcdf87..5b9a1a3 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -111,7 +111,7 @@ void save_prefs(guidata *gui) key_file=g_key_file_new(); /*g_key_file_set_list_separator(key_file, 0x0D);*/ - g_key_file_set_comment(key_file, NULL, NULL, " Version 0.8.5\n \ + g_key_file_set_comment(key_file, NULL, NULL, " Version 0.8.6\n \ Do not edit this file!", NULL); g_key_file_set_string(key_file, "GUI", "Bin", gui->binpath); diff --git a/src/toggles.c b/src/toggles.c index 662d56a..c484ee0 100644 --- a/src/toggles.c +++ b/src/toggles.c @@ -360,7 +360,7 @@ gchar* get_cfg(const gchar *home, guidata *gui) #endif if (g_file_test (cfg_path, G_FILE_TEST_IS_REGULAR)) - print_log("Starting Mednaffe 0.8.5\n\ + print_log("Starting Mednaffe 0.8.6\n\ Mednafen 09x configuration file found.\n", FE, gui); else return NULL; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mednaffe.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
