Store a const char* instead of a std::string in gtest parameter arrays

This avoids valgrind warnings about using unintialized data.

Martin Storsjö committed 11 years ago

Commit 7208ed11 parent e29ceca1 file · +3 −3Browse files

Showing the changes to test/api/encode_decode_api_test.cpp (1 of 1 file). Show all

Unified · Split

@@ -3401,7 +3401,7 @@ struct EncodeOptionParam { · 3400 unmodified lines
3401	3401	int uiMaxNalLen;
3402	3402	float fFramerate;
3403	3403	int iThreads;
3404		− std::string sFileSave;
	3404	+ const char* sFileSave;
3405	3405	};
3406	3406
3407	3407	static const EncodeOptionParam kOptionParamArray[] = {
@@ -3466,8 +3466,8 @@ TEST_P (EncodeTestAPI, SetEncOptionSize) { · 58 unmodified lines
3466	3466	srand(1002);
3467	3467	EncodeOptionParam p = GetParam();
3468	3468	FILE * pFile = NULL;
3469		− if(!p.sFileSave.empty()) {
3470		− pFile = fopen(p.sFileSave.c_str(), "wb");
	3469	+ if (p.sFileSave != NULL && strlen(p.sFileSave) > 0) {
	3470	+ pFile = fopen(p.sFileSave, "wb");
3471	3471	}
3472	3472	memset (&param_, 0, sizeof (SEncParamExt));
3473	3473	encoder_->GetDefaultParams (&param_);

Keyboard shortcuts