Merge pull request #4649 from fr500/master

Check if this string is null before trying to copy it

CHANGES.md

@@ -1,16 +1,22 @@
 # 1.4.2 (future)
 - 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: WIP leaderboards support 
 - COMMON: Threading fixes 
 - DOS: Add keyboard driver
 - DOS: Improve color accuracy and scalines
+- GUI: Various settings are now only visible when advanced settings is enabled
 - LOCALIZATION: Rewrite german translation 
 - LOCALIZATION: Update several english sublabels 
 - NET: Allow manual netplay content loading 
 - NET: Announcing network games to the public lobby is optional now 
-- NET: fix netplay join for contentless cores 
-- SCANNER: always add 7z & zip to supported extensions
+- NET: Bake in miniupnpc
+- 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 
+- WINDOWS: Logging to file no longer spawns an empty window
 
 # 1.4.1

tasks/task_netplay_find_content.c

@@ -1,5 +1,6 @@
 /*  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
  *  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));
 
-         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,
                   info->list[i].supported_extensions, sizeof(state->core_extensions));