diff options
| -rwxr-xr-x | plugins/New_GPG/src/utilities.cpp | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp index af1e942cc8..585f633e8b 100755 --- a/plugins/New_GPG/src/utilities.cpp +++ b/plugins/New_GPG/src/utilities.cpp @@ -934,7 +934,8 @@ static JABBER_HANDLER_FUNC PrescenseHandler(IJabberInterface *ji, HXML node, voi if(_tcsstr(nodename2, _T("status")))
{
LPCTSTR status = xi.getText(local_node2);
- status_str = status;
+ if(status)
+ status_str = status;
break;
}
local_node2 = xi.getChild(node, n);
@@ -1892,26 +1893,26 @@ void strip_line_term(std::string &s) }
void strip_tags(std::wstring &str)
-{ - std::wstring::size_type p; - if(_tcslen(inopentag)) - { - for(p = str.find(inopentag); p != std::wstring::npos; p = str.find(inopentag)) - str.erase(p, _tcslen(inopentag)); - } - if(_tcslen(inclosetag)) - { - for(p = str.find(inclosetag); p != std::wstring::npos; p = str.find(inclosetag)) - str.erase(p, _tcslen(inclosetag)); - } - if(_tcslen(outopentag)) - { - for(p = str.find(outopentag); p != std::wstring::npos; p = str.find(outopentag)) - str.erase(p, _tcslen(outopentag)); - } - if(_tcslen(outclosetag)) - { - for(p = str.find(outclosetag); p != std::wstring::npos; p = str.find(outclosetag)) - str.erase(p, _tcslen(outclosetag)); - } +{
+ std::wstring::size_type p;
+ if(_tcslen(inopentag))
+ {
+ for(p = str.find(inopentag); p != std::wstring::npos; p = str.find(inopentag))
+ str.erase(p, _tcslen(inopentag));
+ }
+ if(_tcslen(inclosetag))
+ {
+ for(p = str.find(inclosetag); p != std::wstring::npos; p = str.find(inclosetag))
+ str.erase(p, _tcslen(inclosetag));
+ }
+ if(_tcslen(outopentag))
+ {
+ for(p = str.find(outopentag); p != std::wstring::npos; p = str.find(outopentag))
+ str.erase(p, _tcslen(outopentag));
+ }
+ if(_tcslen(outclosetag))
+ {
+ for(p = str.find(outclosetag); p != std::wstring::npos; p = str.find(outclosetag))
+ str.erase(p, _tcslen(outclosetag));
+ }
}
\ No newline at end of file |