ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4649 from fr500/master 

Check if this string is null before trying to copy it
This commit is contained in:
Twinaphex 2017-02-16 00:36:27 +01:00 committed by GitHub
parent 37baccab99 14c1d48c66
commit 37b2ebfcaa
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGES.md
View File

@ -1,16 +1,22 @@
# 1.4.2 (future) # 1.4.2 (future)
- ANDROID: Autoconf fallback - ANDROID: Autoconf fallback
- ANDROID: Mouse support / Emulated mouse support
- AUTOCONF: Fix partial matches for pad name
- CHEEVOS: Fix crashes in the cheevos description menu - CHEEVOS: Fix crashes in the cheevos description menu
- CHEEVOS: WIP leaderboards support - CHEEVOS: WIP leaderboards support
- COMMON: Threading fixes - COMMON: Threading fixes
- DOS: Add keyboard driver - DOS: Add keyboard driver
- DOS: Improve color accuracy and scalines - DOS: Improve color accuracy and scalines
- GUI: Various settings are now only visible when advanced settings is enabled
- LOCALIZATION: Rewrite german translation - LOCALIZATION: Rewrite german translation
- LOCALIZATION: Update several english sublabels - LOCALIZATION: Update several english sublabels
- NET: Allow manual netplay content loading - NET: Allow manual netplay content loading
- NET: Announcing network games to the public lobby is optional now - NET: Announcing network games to the public lobby is optional now
- NET: fix netplay join for contentless cores - NET: Bake in miniupnpc
- SCANNER: always add 7z & zip to supported extensions - NET: Fix netplay join for contentless cores
- SCANNER: Always add 7z & zip to supported extensions
- VULKAN: Find supported composite alpha in swapchain
- WIIU: Keyboard support - WIIU: Keyboard support
- WINDOWS: Logging to file no longer spawns an empty window
# 1.4.1 # 1.4.1

6
tasks/task_netplay_find_content.c
View File

@ -1,5 +1,6 @@
/* RetroArch - A frontend for libretro. /* RetroArch - A frontend for libretro.
* Copyright (C) 2016 - Jean-André Santoni * Copyright (C) 2017 - Jean-André Santoni
* Copyright (C) 2017 - Andrés Suárez
* *
* RetroArch is free software: you can redistribute it and/or modify it under the terms * RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found- * of the GNU General Public License as published by the Free Software Found-
@ -272,7 +273,8 @@ bool task_push_netplay_crc_scan(uint32_t crc, char* name,
{ {
strlcpy(state->core_path, info->list[i].path, sizeof(state->core_path)); strlcpy(state->core_path, info->list[i].path, sizeof(state->core_path));
if (!string_is_equal(state->content_path, "N/A")) if (!string_is_equal(state->content_path, "N/A") &&
!string_is_empty(info->list[i].supported_extensions))
{ {
strlcpy(state->core_extensions, strlcpy(state->core_extensions,
info->list[i].supported_extensions, sizeof(state->core_extensions)); info->list[i].supported_extensions, sizeof(state->core_extensions));