Merge pull request #6244 from aliaspider/master

prevent crash in render_msg and add byte-order-marker for msvc.
This commit is contained in:
Twinaphex 2018-02-06 12:19:23 +01:00 committed by GitHub
commit fe4b8983e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 28 deletions

View File

@ -709,7 +709,7 @@ void font_driver_render_msg(
{
font_data_t *font = (font_data_t*)(font_data ? font_data : video_font_driver);
if (font && font->renderer && font->renderer->render_msg)
if (msg && *msg && font && font->renderer && font->renderer->render_msg)
{
#ifdef HAVE_LANGEXTRA
char* new_msg = font_driver_reshape_msg(msg);

View File

@ -1,4 +1,4 @@
/* RetroArch - A frontend for libretro.
/* RetroArch - A frontend for libretro.
* Copyright (C) 2011-2017 - Daniel De Matteis
* Copyright (C) 2016-2017 - Brad Parker
*

View File

@ -1,4 +1,4 @@
MSG_HASH(
MSG_HASH(
MSG_COMPILER,
"Compiler"
)
@ -252,7 +252,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_AUDIO_DRIVER,
"Audio Driver"
"نظام تشغيل الصوت"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_AUDIO_DSP_PLUGIN,
@ -296,7 +296,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS,
"Audio"
"الصوت"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_AUDIO_SYNC,
@ -424,7 +424,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CAMERA_DRIVER,
"Camera Driver"
"نظام تشغيل الكاميرا"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CHEAT,
@ -618,7 +618,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_NONE,
MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_NOT_FOUND,
"Directory not found.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS,
"Directory")
"الدلائل")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS,
"Disk Cycle Tray Status")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_IMAGE_APPEND,
@ -640,7 +640,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
"DPI Override")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
"Driver")
"أنظمة التشغيل")
MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
"Load Dummy on Core Shutdown")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CHECK_FOR_MISSING_FIRMWARE,
@ -776,7 +776,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_TYPE,
MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_INDEX,
"Mouse Index")
MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_DRIVER,
"Input Driver")
"نظام تشغيل أجهزة الادخال")
MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE,
"Duty Cycle")
MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BINDS,
@ -932,7 +932,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_REMAP_BINDS_ENABLE,
MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_SAVE_AUTOCONFIG,
"Save Autoconfig")
MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_SETTINGS,
"Input")
"أجهزة الادخال")
MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_SMALL_KEYBOARD_ENABLE,
"Small Keyboard Enable")
MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_TOUCH_ENABLE,
@ -948,7 +948,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR,
"Input Autoconfig")
MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
"Joypad Driver")
"نظام تشغيل الجوي باد")
MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
"Services")
MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
@ -1036,7 +1036,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_FOOTER_OPACITY,
MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_HEADER_OPACITY,
"Header Opacity")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_DRIVER,
"Menu Driver")
"نظام تشغيل القائمة")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_ENUM_THROTTLE_FRAMERATE,
"Throttle Menu Framerate")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS,
@ -1148,7 +1148,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_ENABLE,
MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_PORT,
"Network Remote Base Port")
MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS,
"Network")
"الشبكة")
MSG_HASH(MENU_ENUM_LABEL_VALUE_NO,
"No")
MSG_HASH(MENU_ENUM_LABEL_VALUE_NONE,
@ -1196,7 +1196,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_ONLINE,
MSG_HASH(MENU_ENUM_LABEL_VALUE_ONLINE_UPDATER,
"التحديث عبر الانترنت")
MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_DISPLAY_SETTINGS,
"Onscreen Display")
"العرض على الشاشة")
MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_OVERLAY_SETTINGS,
"Onscreen Overlay")
MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_NOTIFICATIONS_SETTINGS,
@ -1230,11 +1230,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_PAUSE_NONACTIVE,
MSG_HASH(MENU_ENUM_LABEL_VALUE_PERFCNT_ENABLE,
"Performance Counters")
MSG_HASH(MENU_ENUM_LABEL_VALUE_PLAYLISTS_TAB,
"Playlists")
"قوائم التشغيل")
MSG_HASH(MENU_ENUM_LABEL_VALUE_PLAYLIST_DIRECTORY,
"Playlist")
"قائمة التشغيل")
MSG_HASH(MENU_ENUM_LABEL_VALUE_PLAYLIST_SETTINGS,
"Playlists")
"قوائم التشغيل")
MSG_HASH(MENU_ENUM_LABEL_VALUE_POINTER_ENABLE,
"Touch Support")
MSG_HASH(MENU_ENUM_LABEL_VALUE_PORT,
@ -1242,7 +1242,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_PORT,
MSG_HASH(MENU_ENUM_LABEL_VALUE_PRESENT,
"Present")
MSG_HASH(MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS,
"Privacy")
"خصوصية")
MSG_HASH(MENU_ENUM_LABEL_VALUE_QUIT_RETROARCH,
"إنهاء البرنامج")
MSG_HASH(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ANALOG,
@ -1312,7 +1312,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_RECORDING_SETTINGS,
MSG_HASH(MENU_ENUM_LABEL_VALUE_RECORD_CONFIG,
"Load Recording Config...")
MSG_HASH(MENU_ENUM_LABEL_VALUE_RECORD_DRIVER,
"Record Driver")
"نظام تشغيل التسجيل")
MSG_HASH(MENU_ENUM_LABEL_VALUE_RECORD_ENABLE,
"Enable Recording")
MSG_HASH(MENU_ENUM_LABEL_VALUE_RECORD_PATH,
@ -1348,7 +1348,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_RETROPAD,
MSG_HASH(MENU_ENUM_LABEL_VALUE_RETROPAD_WITH_ANALOG,
"RetroPad w/ Analog")
MSG_HASH(MENU_ENUM_LABEL_VALUE_RETRO_ACHIEVEMENTS_SETTINGS,
"Achievements")
"الإنجازات")
MSG_HASH(MENU_ENUM_LABEL_VALUE_REWIND_ENABLE,
"Rewind Enable")
MSG_HASH(MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY,
@ -1396,7 +1396,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_NEW_CONFIG,
MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_STATE,
"Save State")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS,
"Saving")
"الحفظ")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SCAN_DIRECTORY,
"Scan Directory")
MSG_HASH(MENU_ENUM_LABEL_VALUE_SCAN_FILE,
@ -1670,15 +1670,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_OVERLAYS,
MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_SLANG_SHADERS,
"Update Slang Shaders")
MSG_HASH(MENU_ENUM_LABEL_VALUE_USER,
"User")
"المستخدم")
MSG_HASH(MENU_ENUM_LABEL_VALUE_KEYBOARD,
"Kbd")
MSG_HASH(MENU_ENUM_LABEL_VALUE_USER_INTERFACE_SETTINGS,
"User Interface")
"واجهة المستخدم")
MSG_HASH(MENU_ENUM_LABEL_VALUE_USER_LANGUAGE,
"Language")
MSG_HASH(MENU_ENUM_LABEL_VALUE_USER_SETTINGS,
"User")
"المستخدم")
MSG_HASH(MENU_ENUM_LABEL_VALUE_USE_BUILTIN_IMAGE_VIEWER,
"Use Builtin Image Viewer")
MSG_HASH(MENU_ENUM_LABEL_VALUE_USE_BUILTIN_PLAYER,
@ -1700,7 +1700,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN,
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
"Disable Desktop Composition")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
"Video Driver")
"نظام تشغيل الفيديو")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
"Video Filter")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_DIR,
@ -1752,7 +1752,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SCALE,
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER,
"Integer Scale")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS,
"Video")
"الفيديو")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_DIR,
"Video Shader")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES,
@ -1806,7 +1806,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN_X,
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN_Y,
"Fullscreen Height")
MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_DRIVER,
"Wi-Fi Driver")
"نظام تشغيل الواي-فاي")
MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS,
"Wi-Fi")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR,
@ -1904,7 +1904,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_BADGES_ENABLE,
MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_VERBOSE_ENABLE,
"Enable or disable OSD verbosity for achievements.")
MSG_HASH(MENU_ENUM_SUBLABEL_DRIVER_SETTINGS,
"Change drivers used by the system.")
"تغيير أنظمة التشغيل المستخدمة من قبل البرنامج.")
MSG_HASH(MENU_ENUM_SUBLABEL_RETRO_ACHIEVEMENTS_SETTINGS,
"Change achievement settings.")
MSG_HASH(MENU_ENUM_SUBLABEL_CORE_SETTINGS,