frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed offset and size handling in 'libsi' from 'unsigned' to 'signed', so that overflows can be better detected

Browse Source
This commit is contained in:
Klaus Schmidinger
2006-02-18 10:42:55 +01:00
parent afebd4b2fb
commit 5ed4504ce0
7 changed files with 67 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libsi/util.c
View File

@@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* $Id: util.c 1.5 2005/05/28 14:15:29 kls Exp $
* $Id: util.c 1.6 2006/02/18 10:38:20 kls Exp $
* *
***************************************************************************/
@@ -47,7 +47,7 @@ CharArray& CharArray::operator=(const CharArray &f) {
return *this;
}
void CharArray::assign(const unsigned char*data, unsigned int size, bool doCopy) {
void CharArray::assign(const unsigned char*data, int size, bool doCopy) {
//immutable
if (!data_)
data_= doCopy ? (Data*)new DataOwnData() : (Data*)new DataForeignData();
@@ -76,13 +76,13 @@ bool CharArray::operator==(const CharArray &other) const {
return false;
//do _not_ use strcmp! Data is not necessarily null-terminated.
for (unsigned int i=0;i<data_->size;i++)
for (int i=0;i<data_->size;i++)
if (data_->data[i] != other.data_->data[i])
return false;
return true;
}
CharArray CharArray::operator+(const unsigned int offset) const {
CharArray CharArray::operator+(const int offset) const {
CharArray f(*this);
f.off+=offset;
return f;
@@ -117,7 +117,7 @@ CharArray::DataOwnData::~DataOwnData() {
Delete();
}
void CharArray::DataOwnData::assign(const unsigned char*d, unsigned int s) {
void CharArray::DataOwnData::assign(const unsigned char*d, int s) {
Delete();
size=s;
unsigned char *newdata=new unsigned char[size];
@@ -133,7 +133,7 @@ CharArray::DataForeignData::~DataForeignData() {
Delete();
}
void CharArray::DataForeignData::assign(const unsigned char*d, unsigned int s) {
void CharArray::DataForeignData::assign(const unsigned char*d, int s) {
size=s;
data=d;
}
@@ -143,7 +143,7 @@ void CharArray::DataForeignData::Delete() {
}
/*
void CharArray::Data::assign(unsigned int s) {
void CharArray::Data::assign(int s) {
if (data)
delete[] data;
size=s;