Merge branch 'master' into another

.travis.yml

@@ -3,17 +3,13 @@ os:
 - linux
 - osx
 sudo: required
-dist: trusty
+dist: xenial
 osx_image: xcode8
 addons:
   ssh_known_hosts:
   - github.com
   apt:
-    sources:
-      - ubuntu-toolchain-r-test
     packages:
-      - gcc-6
-      - g++-6
       - libfreetype6-dev
       - libevent-dev
       - libsqlite3-dev
@@ -25,7 +21,6 @@ env:
 - USE_IRRKLANG=1
 before_install:
 - git submodule update --init --recursive
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo ln -s /usr/bin/gcc-6 /usr/local/bin/gcc; sudo ln -s /usr/bin/g++-6 /usr/local/bin/g++; fi
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     brew update > /dev/null;
     brew install freetype libevent sqlite p7zip dylibbundler > /dev/null;

gframe/replay.cpp

@@ -170,7 +170,10 @@ bool Replay::OpenReplay(const wchar_t* name) {
 	}
 	if(!fp)
 		return false;
-	fread(&pheader, sizeof(pheader), 1, fp);
+	if(fread(&pheader, sizeof(pheader), 1, fp) < 1) {
+		fclose(fp);
+		return false;
+	}
 	if(pheader.flag & REPLAY_COMPRESSED) {
 		comp_size = fread(comp_data, 1, 0x1000, fp);
 		fclose(fp);
@@ -199,9 +202,9 @@ bool Replay::CheckReplay(const wchar_t* name) {
 	if(!rfp)
 		return false;
 	ReplayHeader rheader;
-	fread(&rheader, sizeof(ReplayHeader), 1, rfp);
+	size_t count = fread(&rheader, sizeof(ReplayHeader), 1, rfp);
 	fclose(rfp);
-	return rheader.id == 0x31707279 && rheader.version >= 0x12d0;
+	return count == 1 && rheader.id == 0x31707279 && rheader.version >= 0x12d0;
 }
 bool Replay::DeleteReplay(const wchar_t* name) {
 	wchar_t fname[256];

gframe/single_mode.cpp

@@ -52,6 +52,7 @@ int SingleMode::SinglePlayThread(void* param) {
 	myswprintf(mainGame->dInfo.strLP[1], L"%d", mainGame->dInfo.lp[1]);
 	BufferIO::CopyWStr(mainGame->ebNickName->getText(), mainGame->dInfo.hostname, 20);
 	mainGame->dInfo.clientname[0] = 0;
+	mainGame->dInfo.player_type = 0;
 	mainGame->dInfo.turn = 0;
 	mainGame->dInfo.announce_cache.clear();
 	char filename[256];

ocgcore @ f9454100

-Subproject commit 8872427627495ded6e8aa0e3e837e679b4c96484
+Subproject commit f9454100847dcc6b777f98b39c737cc3c517703d

script @ c3a8497c

-Subproject commit bc26f53a53296fc481b18044195f34c97066fd57
+Subproject commit c3a8497c175a7a43522085687127048a8675eeee