From Christian Mayer fixing some array allocation/overrun errors.
This commit is contained in:
parent
09d1e59156
commit
dcf937e39f
1 changed files with 7 additions and 7 deletions
|
@ -447,12 +447,12 @@ void fgPropPicker::find_props ()
|
||||||
pi = 0;
|
pi = 0;
|
||||||
} else {
|
} else {
|
||||||
// add two for the .. and .
|
// add two for the .. and .
|
||||||
num_files = num_files +2;
|
num_files = num_files + 2;
|
||||||
// make room for .. and .
|
// make room for .. and .
|
||||||
files = new char* [ num_files+3 ] ;
|
files = new char* [ num_files+1 ] ;
|
||||||
names = new char* [ num_files+3 ] ;
|
names = new char* [ num_files+1 ] ;
|
||||||
values = new char* [ num_files+3 ] ;
|
values = new char* [ num_files+1 ] ;
|
||||||
dflag = new char [ num_files+3 ] ;
|
dflag = new char [ num_files+1 ] ;
|
||||||
line = ".";
|
line = ".";
|
||||||
files [ 0 ] = new char[ strlen(line.c_str())+2 ];
|
files [ 0 ] = new char[ strlen(line.c_str())+2 ];
|
||||||
strcpy ( files [ 0 ], line.c_str() );
|
strcpy ( files [ 0 ], line.c_str() );
|
||||||
|
@ -462,7 +462,7 @@ void fgPropPicker::find_props ()
|
||||||
dflag[ 0 ] = 1;
|
dflag[ 0 ] = 1;
|
||||||
files [ 1 ] = new char[ strlen(line.c_str())+2 ];
|
files [ 1 ] = new char[ strlen(line.c_str())+2 ];
|
||||||
strcpy ( files [ 1 ], line.c_str() );
|
strcpy ( files [ 1 ], line.c_str() );
|
||||||
names [ 1 ] = new char[ 2 ];
|
names [ 1 ] = new char[ strlen(line.c_str())+2 ];
|
||||||
values[ 1 ] = new char[ 2 ] ;
|
values[ 1 ] = new char[ 2 ] ;
|
||||||
strcpy ( names [ 1 ], line.c_str() );
|
strcpy ( names [ 1 ], line.c_str() );
|
||||||
|
|
||||||
|
@ -471,7 +471,7 @@ void fgPropPicker::find_props ()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
for (int i = 0; i < (int)node->nChildren()-1; i++) {
|
for (i = 0; i < (int)node->nChildren()-1; i++) {
|
||||||
SGPropertyNode * child = node->getChild(i);
|
SGPropertyNode * child = node->getChild(i);
|
||||||
name = child->getName();
|
name = child->getName();
|
||||||
line = name;
|
line = name;
|
||||||
|
|
Loading…
Reference in a new issue