[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash libamf/buffer.cpp testsuite/libamf.all/te...
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash libamf/buffer.cpp testsuite/libamf.all/te... |
Date: |
Fri, 11 Apr 2008 21:13:49 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 08/04/11 21:13:49
Modified files:
libamf : buffer.cpp
testsuite/libamf.all: test_buffer.cpp
Log message:
Cleanup all memory problems in the test case.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/buffer.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_buffer.cpp?cvsroot=gnash&r1=1.3&r2=1.4
Patches:
Index: libamf/buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/buffer.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libamf/buffer.cpp 11 Apr 2008 21:04:34 -0000 1.4
+++ libamf/buffer.cpp 11 Apr 2008 21:13:49 -0000 1.5
@@ -373,7 +373,7 @@
}
std::copy(start + 1, end(), start);
- *(end()) = 0;
+// *(end()) = 0;
_nbytes--;
return _ptr;
@@ -384,7 +384,7 @@
{
// GNASH_REPORT_FUNCTION;
std::copy((_ptr + start + 1), end(), (_ptr + start)),
- *end() = 0;
+// *end() = 0;
_nbytes--;
return _ptr;
}
Index: testsuite/libamf.all/test_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_buffer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/libamf.all/test_buffer.cpp 11 Apr 2008 21:04:34 -0000
1.3
+++ testsuite/libamf.all/test_buffer.cpp 11 Apr 2008 21:13:49 -0000
1.4
@@ -333,17 +333,21 @@
void
test_remove()
{
- Network::byte_t *data1 = new Network::byte_t[10];
- memset(data1, 0, 10);
- Network::byte_t *data2 = new Network::byte_t[10];
- memset(data2, 0, 10);
- for (size_t i=0; i< 10; i++) {
+ Network::byte_t *data1 = new Network::byte_t[12];
+ memset(data1, 0, 12);
+ Network::byte_t *data2 = new Network::byte_t[12];
+ memset(data2, 0, 12);
+ Network::byte_t *data3 = new Network::byte_t[12];
+ memset(data3, 0, 12);
+
+ // populate a buffer with some data
+ for (size_t i=0; i< 12; i++) {
data1[i] = i + 'a';
}
// Build identical buffer nissing one character
memcpy(data2, data1, 6);
- memcpy(data2 + 6, data1 + 7, 5);
+ memcpy(data2 + 6, data1 + 7, 4);
// Remove a single byte
Network::byte_t byte = 'g';
@@ -368,10 +372,8 @@
}
// Remove a range of bytes
- Network::byte_t *data3 = new Network::byte_t[10];
- memset(data3, 0, 10);
memcpy(data3, data1, 6);
- memcpy(data3 + 6, data1 + 9, 5);
+ memcpy(data3 + 6, data1 + 9, 1);
Buffer buf3(10);
buf3.clear();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash libamf/buffer.cpp testsuite/libamf.all/te...,
Rob Savoye <=