Don't order pointers relative to 0, check for NULLness.

6 files changed, 89 insertions, 1 deletions

diff --git a/emulators/mednafen/distinfo b/emulators/mednafen/distinfo
index a5c7e18bd73..295bdf1d3a2 100644
--- a/emulators/mednafen/distinfo
+++ b/emulators/mednafen/distinfo
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.14 2015/11/03 20:31:00 agc Exp $
+$NetBSD: distinfo,v 1.15 2016/12/17 14:24:37 joerg Exp $
 
 SHA1 (mednafen-0.8.D.3.tar.bz2) = b19b92101853cb653506456fd8ab1c0bb0b6e636
 RMD160 (mednafen-0.8.D.3.tar.bz2) = 546f49a9541ba4d0367fe682aef23cdadf3d7325
 SHA512 (mednafen-0.8.D.3.tar.bz2) = 40c47554ae42025640c754fe4a578f5b6e1adb623418126adca587b2795ae4e6581d6d96ffa497849706a1ea4d11f9962c44df2040ead788670e6314d8a9b7e7
 Size (mednafen-0.8.D.3.tar.bz2) = 2442705 bytes
+SHA1 (patch-src_cdrom_cdromfile.cpp) = 870e5563cc2a0d69826cc8931305aa982303aaf0
+SHA1 (patch-src_mempatcher.cpp) = 43fbb9d00948f485dd61594f10a91fc28fdb84eb
+SHA1 (patch-src_nes_ines.cpp) = e9d3a8c151ffe5e21ad5ddef64a7ba4b95e2b851
+SHA1 (patch-src_psf.cpp) = e3e60fd90cbcb0d5dac32e5ab9bfb71f94a879f1
+SHA1 (patch-src_settings.cpp) = a69cea82eb722418ce2757c37d876bb99b04dfce
 SHA1 (patch-src_wswan_dis_opcodes_inc) = 547ad7a0a7943f1697e64a9607429211fc62fd56
diff --git a/emulators/mednafen/patches/patch-src_cdrom_cdromfile.cpp b/emulators/mednafen/patches/patch-src_cdrom_cdromfile.cpp
new file mode 100644
index 00000000000..f553834294d
--- /dev/null
+++ b/emulators/mednafen/patches/patch-src_cdrom_cdromfile.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_cdrom_cdromfile.cpp,v 1.1 2016/12/17 14:24:37 joerg Exp $
+
+--- src/cdrom/cdromfile.cpp.orig	2016-12-15 14:22:07.554338091 +0000
++++ src/cdrom/cdromfile.cpp
+@@ -410,7 +410,7 @@ CDRFile *cdrfile_open(const char *path)
+   CDRFILE_TRACK_INFO TmpTrack;
+   memset(&TmpTrack, 0, sizeof(TmpTrack));
+ 
+-  while(fgets(linebuf, 512, fp) > 0)
++  while(fgets(linebuf, 512, fp))
+   {
+    char cmdbuf[512], raw_args[512], args[4][512];
+    int argcount = 0;
diff --git a/emulators/mednafen/patches/patch-src_mempatcher.cpp b/emulators/mednafen/patches/patch-src_mempatcher.cpp
new file mode 100644
index 00000000000..0e274d6a9ab
--- /dev/null
+++ b/emulators/mednafen/patches/patch-src_mempatcher.cpp
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_mempatcher.cpp,v 1.1 2016/12/17 14:24:37 joerg Exp $
+
+--- src/mempatcher.cpp.orig	2016-12-15 14:21:04.855680936 +0000
++++ src/mempatcher.cpp
+@@ -191,7 +191,7 @@ static bool SeekToOurSection(FILE *fp) /
+ {
+  char buf[2048];
+ 
+- while(fgets(buf,2048,fp) > 0)
++ while(fgets(buf,2048,fp))
+  {
+   if(buf[0] == '[')
+   {
+@@ -243,7 +243,7 @@ void MDFN_LoadGameCheats(FILE *override)
+ 
+  if(SeekToOurSection(fp))
+  {
+-  while(fgets(linebuf,2048,fp) > 0)
++  while(fgets(linebuf,2048,fp))
+   { 
+    char namebuf[2048];
+    char *tbuf=linebuf;
+@@ -382,7 +382,7 @@ void MDFN_FlushGameCheats(int nosave)
+   {
+    FILE *tmp_fp = fopen(tmp_fn.c_str(), "wb");
+ 
+-   while(fgets((char*)linebuf, 2048, fp) > 0)
++   while(fgets((char*)linebuf, 2048, fp))
+    {
+     if(linebuf[0] == '[' && !insection)
+     {
diff --git a/emulators/mednafen/patches/patch-src_nes_ines.cpp b/emulators/mednafen/patches/patch-src_nes_ines.cpp
new file mode 100644
index 00000000000..048da6dda1d
--- /dev/null
+++ b/emulators/mednafen/patches/patch-src_nes_ines.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_nes_ines.cpp,v 1.1 2016/12/17 14:24:37 joerg Exp $
+
+--- src/nes/ines.cpp.orig	2016-12-15 14:08:23.897104355 +0000
++++ src/nes/ines.cpp
+@@ -323,7 +323,7 @@ static void SetInput(void)
+ 	};
+  int x=0;
+ 
+- while(moo[x].input1 > 0 || moo[x].input2 > 0 || moo[x].inputfc > 0)
++ while(moo[x].input1 || moo[x].input2 || moo[x].inputfc)
+  {
+   if(moo[x].crc32==iNESGameCRC32)
+   {
diff --git a/emulators/mednafen/patches/patch-src_psf.cpp b/emulators/mednafen/patches/patch-src_psf.cpp
new file mode 100644
index 00000000000..8785b9b4535
--- /dev/null
+++ b/emulators/mednafen/patches/patch-src_psf.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_psf.cpp,v 1.1 2016/12/17 14:24:37 joerg Exp $
+
+--- src/psf.cpp.orig	2016-12-15 14:21:49.256613383 +0000
++++ src/psf.cpp
+@@ -225,7 +225,7 @@ static PSFINFO *LoadPSF(void (*datafunc)
+           {
+            char linebuf[1024];
+ 
+-           while(MDFN_fgets(linebuf,1024,fp)>0)
++           while(MDFN_fgets(linebuf,1024,fp))
+            {
+             int x;
+ 	    char *key=0,*value=0;
diff --git a/emulators/mednafen/patches/patch-src_settings.cpp b/emulators/mednafen/patches/patch-src_settings.cpp
new file mode 100644
index 00000000000..0bedbefc802
--- /dev/null
+++ b/emulators/mednafen/patches/patch-src_settings.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_settings.cpp,v 1.1 2016/12/17 14:24:37 joerg Exp $
+
+--- src/settings.cpp.orig	2016-12-15 14:21:35.471903115 +0000
++++ src/settings.cpp
+@@ -166,7 +166,7 @@ bool MFDN_LoadSettings(const char *based
+ 
+  char linebuf[1024];
+ 
+- while(fgets(linebuf, 1024, fp) > 0)
++ while(fgets(linebuf, 1024, fp))
+  {
+   char *spacepos = strchr(linebuf, ' ');
+   md5_context md5;