SF.net SVN: bzflag:[22815] trunk/bzflag/misc/rrlog.cxx

[<bul...@us...>]

Revision: 22815
          http://sourceforge.net/p/bzflag/code/22815
Author:   bullet_catcher
Date:     2013-06-21 20:19:08 +0000 (Fri, 21 Jun 2013)
Log Message:
-----------
Include string.h, preserve const quality, and use NULL instead of false so rrlog will compile successfully.
Copy correct header size calculations from RecordReplay.cxx, and don't dereference a null pointer.

Modified Paths:
--------------
    trunk/bzflag/misc/rrlog.cxx

Modified: trunk/bzflag/misc/rrlog.cxx
===================================================================
--- trunk/bzflag/misc/rrlog.cxx	2013-06-21 11:57:05 UTC (rev 22814)
+++ trunk/bzflag/misc/rrlog.cxx	2013-06-21 20:19:08 UTC (rev 22815)
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <string.h>
 #include <time.h>
 #ifndef _WIN32
 #  include <sys/time.h>
@@ -49,6 +50,9 @@
 // Type Definitions
 // ----------------
 
+static const int PACKET_SIZE_STUFFING = 8;
+static const int HEADER_SIZE_STUFFING = 0;
+
 typedef uint16_t u16;
 typedef uint32_t u32;
 typedef s64 RRtime;
@@ -65,8 +69,10 @@
   char *data;
 } RRpacket;
 
-static const int RRpacketHdrSize = sizeof(RRpacket) -
-				   (2 * sizeof(RRpacket*) - sizeof(char*));
+static const unsigned int RRpacketHdrSize =
+  PACKET_SIZE_STUFFING +
+  (2 * sizeof(u16)) + (3 * sizeof(u32)) + sizeof(RRtime);
+
 typedef struct {
   u32 magic;			// record file type identifier
   u32 version;			// record file version
@@ -85,7 +91,10 @@
   char *world;			// the world
 } ReplayHeader;
 
-static const int ReplayHeaderSize = sizeof(ReplayHeader) - (2 * sizeof(char*));
+static const unsigned int ReplayHeaderSize =
+  HEADER_SIZE_STUFFING +
+  (sizeof(u32) * 6) + sizeof(RRtime) +
+  CallSignLen + MottoLen + 8 + MessageLen + 64 + 4 + WorldSettingsSize;
 
 
 // Function Prototypes
@@ -94,7 +103,7 @@
 static void printHelp(const char* execName);
 static bool loadHeader(ReplayHeader *h, FILE *f);
 static RRpacket *loadPacket(FILE *f);
-static void *nboUnpackRRtime(void *buf, RRtime& value);
+static const void *nboUnpackRRtime(const void *buf, RRtime& value);
 static std::string strRRtime(RRtime timestamp);
 
 
@@ -212,6 +221,11 @@
   printf("worldHash: %s\n", header.realHash);
   printf("\n");
 
+  if (!p) {
+    printf("Error in first packet\n");
+    fclose(file);
+    exit(1);
+  }
 
   MsgStrings::init();
   MsgStrings::colorize(useColor);
@@ -285,7 +299,7 @@
 static bool loadHeader(ReplayHeader *h, FILE *f)
 {
   char buffer[ReplayHeaderSize];
-  void *buf;
+  const void *buf;
 
   if (fread(buffer, ReplayHeaderSize, 1, f) <= 0) {
     return false;
@@ -330,10 +344,10 @@
 {
   RRpacket *p;
   char bufStart[RRpacketHdrSize];
-  void *buf;
+  const void *buf;
 
   if (f == NULL) {
-    return false;
+    return NULL;
   }
 
   p = new RRpacket;
@@ -372,7 +386,7 @@
 
 /****************************************************************************/
 
-static void* nboUnpackRRtime(void *buf, RRtime& value)
+static const void* nboUnpackRRtime(const void *buf, RRtime& value)
 {
   u32 msb, lsb;
   buf = nboUnpackUInt(buf, msb);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.