onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-19 09:47:20 +01:00
Code Issues Releases Wiki Activity

* applied two patches by Vadim Zhukov persgray@gmail.com to

Browse Source 
replace calls to sprintf with safer calls to snprintf and fix some
compiler warnings.
This commit is contained in:
Vadim Kurland 2011-07-06 16:43:38 -07:00
parent 6046524a37
commit e0be917ef2
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/ChangeLog
View File

@ -1,5 +1,9 @@
2011-07-06 Vadim Kurland <vadim@netcitadel.com>
* applied two patches by Vadim Zhukov persgray@gmail.com to
replace calls to sprintf with safer calls to snprintf and fix some
compiler warnings.
* Importer.cpp (addStandardImportComment): see #2552 "PF import:
add ability to suppress comments referring to line numbers in the
original file".

9
src/antlr/String.cpp
View File

@ -21,24 +21,25 @@ namespace antlr {
// wh: hack for Borland C++ 5.6
#if __BORLANDC__
using std::sprintf;
using std::snprintf;
#endif
// RK: should be using snprintf actually... (or stringstream)
ANTLR_C_USING(sprintf)
ANTLR_C_USING(snprintf)
ANTLR_USE_NAMESPACE(std)string operator+( const ANTLR_USE_NAMESPACE(std)string& lhs, const int rhs )
{
char tmp[100];
sprintf(tmp,"%d",rhs);
snprintf(tmp, sizeof(tmp), "%d", rhs);
return lhs+tmp;
}
ANTLR_USE_NAMESPACE(std)string operator+( const ANTLR_USE_NAMESPACE(std)string& lhs, size_t rhs )
{
char tmp[100];
sprintf(tmp,"%u",rhs);
snprintf(tmp, sizeof(tmp), "%zu", rhs);
// sprintf(tmp,"%u",rhs);
return lhs+tmp;
}

1
src/import/objectMaker.cpp
View File

@ -317,6 +317,7 @@ ObjectSignature::ObjectSignature(ObjectMakerErrorTracker *et)
}
ObjectSignature::ObjectSignature(const ObjectSignature &other)
: libfwbuilder::Dispatch(other)
{
error_tracker = other.error_tracker;