[Gnash-commit] /srv/bzr/gnash/trunk r10601: various minor cleanups to keep valgrind happy.

[rob]

------------------------------------------------------------
revno: 10601
committer: address@hidden
branch nick: trunk
timestamp: Thu 2009-02-19 12:00:30 -0700
message:
  various minor cleanups to keep valgrind happy.
modified:
  libamf/amf.cpp
  libnet/diskstream.cpp
  testsuite/libamf.all/test_amf.cpp
  testsuite/libnet.all/test_diskstream.cpp
  testsuite/libnet.all/test_rtmp.cpp
    ------------------------------------------------------------
    revno: 10592.1.10
    committer: address@hidden
    branch nick: release_0_8_5
    timestamp: Thu 2009-02-19 11:24:37 -0700
    message:
      fix valgrind errors in test cases.
    modified:
      testsuite/libnet.all/test_rtmp.cpp
    ------------------------------------------------------------
    revno: 10592.1.11
    committer: address@hidden
    branch nick: release_0_8_5
    timestamp: Thu 2009-02-19 11:47:44 -0700
    message:
      fix hex input, it was missing a legit object terminator which screwed up 
parsing.
    modified:
      libamf/amf.cpp
    ------------------------------------------------------------
    revno: 10592.1.12
    committer: address@hidden
    branch nick: release_0_8_5
    timestamp: Thu 2009-02-19 11:56:13 -0700
    message:
      fix hex input, it was missing a legit object terminator which screwed up 
parsing.
    modified:
      testsuite/libamf.all/test_amf.cpp
    ------------------------------------------------------------
    revno: 10592.1.13
    committer: address@hidden
    branch nick: release_0_8_5
    timestamp: Thu 2009-02-19 11:56:37 -0700
    message:
      make less verbose.
    modified:
      testsuite/libnet.all/test_rtmp.cpp
    ------------------------------------------------------------
    revno: 10592.1.14
    committer: address@hidden
    branch nick: release_0_8_5
    timestamp: Thu 2009-02-19 11:57:13 -0700
    message:
      delete the data pointer after unmapping so we don't leak.
    modified:
      libnet/diskstream.cpp
    ------------------------------------------------------------
    revno: 10592.1.15
    committer: address@hidden
    branch nick: release_0_8_5
    timestamp: Thu 2009-02-19 11:57:33 -0700
    message:
      don't close the file.
    modified:
      testsuite/libnet.all/test_diskstream.cpp

=== modified file 'libamf/amf.cpp'
--- a/libamf/amf.cpp    2009-02-19 09:17:14 +0000
+++ b/libamf/amf.cpp    2009-02-19 18:47:44 +0000
@@ -943,7 +943,7 @@
     switch (type) {
       case Element::NUMBER_AMF0:
       {
-         double swapped = *reinterpret_cast<const double*>(tmpptr);
+         double swapped = *(reinterpret_cast<const double*>(tmpptr));
          swapBytes(&swapped, amf::AMF0_NUMBER_SIZE);
          el->makeNumber(swapped); 
          tmpptr += AMF0_NUMBER_SIZE; // all numbers are 8 bit big endian

=== modified file 'libnet/diskstream.cpp'
--- a/libnet/diskstream.cpp     2009-01-31 06:24:01 +0000
+++ b/libnet/diskstream.cpp     2009-02-19 18:57:13 +0000
@@ -235,6 +235,7 @@
     
     if ((_dataptr != MAP_FAILED) && (_dataptr != 0)) {
        munmap(_dataptr, _pagesize);
+       delete[] _dataptr;
        _dataptr = 0;
     }
      

=== modified file 'testsuite/libamf.all/test_amf.cpp'
--- a/testsuite/libamf.all/test_amf.cpp 2009-02-17 03:18:15 +0000
+++ b/testsuite/libamf.all/test_amf.cpp 2009-02-19 18:56:13 +0000
@@ -372,7 +372,7 @@
     }
 
 //    encobj->dump();
-    boost::shared_ptr<Buffer> buf1(new Buffer("03 00 03 61 70 70 02 00 08 6f 
66 6c 61 44 65 6d 6f 00 08 66 6c 61 73 68 56 65 72 02 00 0c 4c 4e 58 20 39 2c 
30 2c 33 31 2c 30 00 06 73 77 66 55 72 6c 02 00 30 68 74 74 70 3a 2f 2f 77 77 
77 2e 72 65 64 35 2e 6e 6c 2f 74 6f 6f 6c 73 2f 70 75 62 6c 69 73 68 65 72 2f 
70 75 62 6c 69 73 68 65 72 2e 73 77 66 09"));
+    boost::shared_ptr<Buffer> buf1(new Buffer("03 00 03 61 70 70 02 00 08 6f 
66 6c 61 44 65 6d 6f 00 08 66 6c 61 73 68 56 65 72 02 00 0c 4c 4e 58 20 39 2c 
30 2c 33 31 2c 30 00 06 73 77 66 55 72 6c 02 00 30 68 74 74 70 3a 2f 2f 77 77 
77 2e 72 65 64 35 2e 6e 6c 2f 74 6f 6f 6c 73 2f 70 75 62 6c 69 73 68 65 72 2f 
70 75 62 6c 69 73 68 65 72 2e 73 77 66 00 00 09"));
     if ((*encobj->reference() == Element::OBJECT_AMF0) &&
         (memcmp(buf1->reference(), encobj->reference(), 101) == 0)) {
         runtest.pass("Encoded Object");

=== modified file 'testsuite/libnet.all/test_diskstream.cpp'
--- a/testsuite/libnet.all/test_diskstream.cpp  2008-12-26 08:08:51 +0000
+++ b/testsuite/libnet.all/test_diskstream.cpp  2009-02-19 18:57:33 +0000
@@ -154,7 +154,7 @@
     }
 
     // close the currently opened file
-    ds1.close();
+//    ds1.close();
     if (ds1.getState() == DiskStream::CLOSED) {
         runtest.pass("close()");
     } else {

=== modified file 'testsuite/libnet.all/test_rtmp.cpp'
--- a/testsuite/libnet.all/test_rtmp.cpp        2009-02-19 18:18:09 +0000
+++ b/testsuite/libnet.all/test_rtmp.cpp        2009-02-19 18:56:37 +0000
@@ -404,7 +404,7 @@
     if (notest) {
         runtest.unresolved("RTMP::split(oflaDemo)");
     } else {
-        queues4->at(0)->dump();
+//        queues4->at(0)->dump();
         if (queues4->size() == 1) {
             runtest.pass("RTMP::split(oflaDemo)");
             notest = false;
@@ -785,7 +785,7 @@
     boost::shared_ptr<amf::Buffer> buf2 = 
rtmp.encodeConnect("mp3_app/id3test", 
"http://renaun.com/flex2/posts/MP3Test.swf";, 
"rtmp://renaun.com/mp3_app/id3test", 615, 124, 1, 
"http://renaun.com/flex2/posts/MP3Test.html";);
 //     cerr << hexify(buf1->begin(), buf1->size(), false) << endl;
 //     cerr << hexify(buf2->begin(), buf1->size(), false) << endl;
-    if ((memcmp(buf1->reference(), buf2->reference(), buf1->size()) == 0)) {
+    if ((memcmp(buf1->reference(), buf2->reference(), buf1->allocated()) == 
0)) {
         runtest.pass("Encoded RTMPClient::encodeConnect()");
     } else {
         runtest.fail("Encoded RTMPClient::encodeConnect()");
@@ -801,7 +801,7 @@
 
     buf1->hex2mem("02 00 05 70 61 75 73 65 00 00 00 00 00 00 00 00 00 05 01 01 
00 00 00 00 00 00 00 00 00");
     buf2 = rtmp.encodeStreamOp(0, RTMP::STREAM_PAUSE, true, 0);
-    if ((memcmp(buf1->reference(), buf2->reference(), buf1->size()) == 0)) {
+    if ((memcmp(buf1->reference(), buf2->reference(), buf1->allocated()) == 
0)) {
         runtest.pass("Encoded RTMPClient::encodeStreamOp(RTMP::STREAM_PAUSE)");
     } else {
         runtest.fail("Encoded RTMPClient::encodeStreamOp(RTMP::STREAM_PAUSE)");
@@ -836,7 +836,7 @@
 
     buf1->hex2mem("02 00 04 73 65 65 6b 00 00 00 00 00 00 00 00 00 05 00 40 c7 
70 00 00 00 00 00");
     buf2 = rtmp.encodeStreamOp(0, RTMP::STREAM_SEEK, false, 12000);
-    if ((memcmp(buf1->reference(), buf2->reference(), buf1->size()) == 0)) {
+    if ((memcmp(buf1->reference(), buf2->reference(), buf2->allocated()) == 
0)) {
         runtest.pass("Encoded RTMPClient::encodeStream(RTMP::SEEK, double)");
     } else {
         runtest.fail("Encoded RTMPClient::encodeStream(RTMP::SEEK, double)");