diff -r cd189dac02f7 -r 5cc91383ab1e secureswitools/swisistools/source/interpretsislib/sisfile.cpp --- a/secureswitools/swisistools/source/interpretsislib/sisfile.cpp Thu Jul 15 18:47:04 2010 +0300 +++ b/secureswitools/swisistools/source/interpretsislib/sisfile.cpp Thu Aug 19 10:02:49 2010 +0300 @@ -204,9 +204,8 @@ if (failed) { - std::string x; - throw InvalidSis(Ucs2ToUtf8(this->GetPackageName(),x), - error, SIS_NOT_SUPPORTED); + std::string x = wstring2string(this->GetPackageName()); + throw InvalidSis(x, error, SIS_NOT_SUPPORTED); } } @@ -263,6 +262,7 @@ success = true; break; case CSISFileDescription::EOpNull: + case CSISFileDescription::EOpNone: success = true; break; default: @@ -276,6 +276,7 @@ break; } } + return success; } @@ -421,9 +422,9 @@ if (ifBlock.WasteOfSpace()) { - std::string x; std::string error = "corrupt SIS file"; - throw InvalidSis(Ucs2ToUtf8(this->GetPackageName(),x), error, INVALID_SIS); + std::string x = wstring2string(this->GetPackageName()); + throw InvalidSis(x, error, INVALID_SIS); } // Main expression