Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace sprintf with snprintf. #1727

Merged
merged 1 commit into from
Jun 27, 2021
Merged

Replace sprintf with snprintf. #1727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions samples/geotag.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,15 +239,15 @@ std::string Position::toExifTimeStamp(std::string& t)
char a,b,c,d,e ;
sscanf(arg,"%d%c%d%c%d%c%d%c%d%c%d",&YY,&a,&MM,&b,&DD,&c,&HH,&d,&mm,&e,&SS1);
}
sprintf(result,"%d/1 %d/1 %d/1",HH,mm,SS1);
snprintf(result,sizeof(result),"%d/1 %d/1 %d/1",HH,mm,SS1);
return std::string(result);
}

std::string Position::toExifString(double d)
{
char result[200];
d *= 100;
sprintf(result, "%d/100", abs(static_cast<int>(d)));
snprintf(result, sizeof(result), "%d/100", abs(static_cast<int>(d)));
return std::string(result);
}

Expand All @@ -266,9 +266,9 @@ std::string Position::toExifString(double d,bool bRational,bool bLat)
int sec = static_cast<int>(d);
char result[200];
if ( bRational )
sprintf(result,"%d/1 %d/1 %d/1" ,deg,min,sec);
snprintf(result,sizeof(result),"%d/1 %d/1 %d/1" ,deg,min,sec);
else
sprintf(result,"%03d%s%02d'%02d\"%s" ,deg,gDeg,min,sec,NSEW);
snprintf(result,sizeof(result),"%03d%s%02d'%02d\"%s" ,deg,gDeg,min,sec,NSEW);
return std::string(result);
}

Expand All @@ -277,7 +277,7 @@ std::string Position::toString() const
char result[200];
std::string sLat = Position::toExifString(lat_,false,true );
std::string sLon = Position::toExifString(lon_,false,false);
sprintf(result,"%s %s %-8.3f",sLon.c_str(),sLat.c_str(),ele_);
snprintf(result,sizeof(result),"%s %s %-8.3f",sLon.c_str(),sLat.c_str(),ele_);
return std::string(result);
}

Expand Down
2 changes: 1 addition & 1 deletion src/iptc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ namespace Exiv2 {
uint16_t record = bytes.at(i + 1);
uint16_t dataset = bytes.at(i + 2);
uint16_t len = getUShort(bytes.subSlice(i + 3, bytes.size()), bigEndian);
sprintf(buff, " %6d | %7d | %-24s | %6d | ", record, dataset,
snprintf(buff, sizeof(buff), " %6d | %7d | %-24s | %6d | ", record, dataset,
Exiv2::IptcDataSets::dataSetName(dataset, record).c_str(), len);

out << buff << Internal::binaryToString(makeSlice(bytes, i + 5, i + 5 + (len > 40 ? 40 : len)))
Expand Down
5 changes: 2 additions & 3 deletions src/jpgimage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,11 +597,10 @@ namespace Exiv2 {
nm[0xc4] = "DHT";
for (int i = 0; i <= 15; i++) {
char MN[16];
/// \todo to be replaced by std::snprintf on master (only available in c++11)
sprintf(MN, "APP%d", i);
snprintf(MN, sizeof(MN), "APP%d", i);
nm[0xe0 + i] = MN;
if (i != 4) {
sprintf(MN, "SOF%d", i);
snprintf(MN, sizeof(MN), "SOF%d", i);
nm[0xc0 + i] = MN;
}
}
Expand Down
9 changes: 6 additions & 3 deletions src/version.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ static std::vector<std::string> getLoadedLibraries()
// http://stackoverflow.com/questions/606041/how-do-i-get-the-path-of-a-process-in-unix-linux
char procsz[100];
char pathsz[500];
sprintf(procsz,"/proc/%d/path/a.out", getpid());
snprintf(procsz, sizeof(procsz), "/proc/%d/path/a.out", getpid());
int l = readlink (procsz, pathsz,sizeof(pathsz));
if (l>0) {
pathsz[l]='\0';
Expand Down Expand Up @@ -251,7 +251,7 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)

#ifndef __VERSION__
char version[40];
sprintf(version,"%d.%02d",(_MSC_VER-600)/100,_MSC_VER%100);
snprintf(version, sizeof(version), "%d.%02d",(_MSC_VER-600)/100,_MSC_VER%100);

// add edition in brackets
// 7.10 = 2003 8.00 = 2005 etc 12.00 = 2013 13.00 = 2015 (yet the installer labels it as 14.0!)
Expand All @@ -261,7 +261,10 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
if ( edition == 14 && _MSC_VER >= 1920 ) edition++ ; // 2019 _MSC_VAR == 1920

if ( edition > lengthof(editions) ) edition = 0 ;
if ( edition ) sprintf(version+::strlen(version)," (%s/%s)",editions[edition],bits==64?"x64":"x86");
if ( edition ) {
const size_t len = ::strlen(version);
snprintf(version+len, sizeof(version) - len, " (%s/%s)",editions[edition],bits==64?"x64":"x86");
}
#define __VERSION__ version
#endif

Expand Down