Attachment #200493 for bug #280640

View | Details | Raw Unified | Return to bug 280640
Collapse All | Expand All

Lines 441-447 Link Here

(-)licq-1.3.6.orig/plugins/msn/src/msn-sb.cpp (-2 / +2 lines)
441	const char *szParam = strServer.c_str();	441	const char *szParam = strServer.c_str();
442	char szServer[16];	442	char szServer[16];
443	char *szPort;	443	char *szPort;
444	if ((szPort = strchr(szParam, ':')))	444	if ((szPort = (char *) strchr(szParam, ':')))
445	{	445	{
446	strncpy(szServer, szParam, szPort - szParam);	446	strncpy(szServer, szParam, szPort - szParam);
447	szServer[szPort - szParam] = '\0';	447	szServer[szPort - szParam] = '\0';
Lines 504-510 Link Here
504	const char *szParam = strServer.c_str();	504	const char *szParam = strServer.c_str();
505	char szServer[16];	505	char szServer[16];
506	char *szPort;	506	char *szPort;
507	if ((szPort = strchr(szParam, ':')))	507	if ((szPort = (char *) strchr(szParam, ':')))
508	{	508	{
509	strncpy(szServer, szParam, szPort - szParam);	509	strncpy(szServer, szParam, szPort - szParam);
510	szServer[szPort - szParam] = '\0';	510	szServer[szPort - szParam] = '\0';

Lines 76-82 Link Here

(-)licq-1.3.6.orig/plugins/msn/src/msn-srv.cpp (-1 / +1 lines)
76	const char *szParam = strServer.c_str();	76	const char *szParam = strServer.c_str();
77	char szNewServer[16];	77	char szNewServer[16];
78	char *szPort;	78	char *szPort;
79	if ((szPort = strchr(szParam, ':')))	79	if ((szPort = (char *) strchr(szParam, ':')))
80	{	80	{
81	strncpy(szNewServer, szParam, szPort - szParam);	81	strncpy(szNewServer, szParam, szPort - szParam);
82	szNewServer[szPort - szParam] = '\0';	82	szNewServer[szPort - szParam] = '\0';




  if (strFirstLine == "HTTP/1.1 200 OK")
  {
    m_pSSLPacket->ParseHeaders();
    const char *fromPP = strstr(m_pSSLPacket->GetValue("Authentication-Info").c_str(), "from-PP=");
    char *tag;

    if (fromPP == 0)

    else
    {
      fromPP+= 9; // skip to the tag
      const char *endTag = strchr(fromPP, '\'');
      tag = strndup(fromPP, endTag - fromPP); // Thanks, this is all we need
    }



  m_pNexusBuff->ParseHeaders();
  
  const char *szLogin = strstr(m_pNexusBuff->GetValue("PassportURLs").c_str(), "DALogin=");
  szLogin += 8; // skip to the tag
  //char *szEndURL = strchr(szLogin, '/');
  //char *szServer = strndup(szLogin, szEndURL - szLogin); // this is all we need

Lines 569-575 Link Here

(-)licq-1.3.6.orig/src/file.cpp (-1 / +1 lines)
569	}	569	}
570	else	570	else
571	{	571	{
572	if ((szPostEquals = strchr(_szLine, '=')) == NULL)	572	if ((szPostEquals = (char *) strchr(_szLine, '=')) == NULL)
573	{	573	{
574	Warn(INI_ExFORMAT, _szLine);	574	Warn(INI_ExFORMAT, _szLine);
575	return NULL;	575	return NULL;

Lines 106-112 Link Here

(-)licq-1.3.6.orig/src/icqd-filetransfer.cpp (-1 / +1 lines)
106	struct stat buf;	106	struct stat buf;
107		107
108	// Remove any path from the filename	108	// Remove any path from the filename
109	if ( (pcNoPath = strrchr(_szFileName, '/')) != NULL)	109	if ( (pcNoPath = (char *) strrchr(_szFileName, '/')) != NULL)
110	m_szFileName = strdup(pcNoPath + 1);	110	m_szFileName = strdup(pcNoPath + 1);
111	else	111	else
112	m_szFileName = strdup(_szFileName);	112	m_szFileName = strdup(_szFileName);

Lines 5874-5880 Link Here

(-)licq-1.3.6.orig/src/icqpacket.cpp (-1 / +1 lines)
5874	}	5874	}
5875		5875
5876	// Remove path from filename (if it exists)	5876	// Remove path from filename (if it exists)
5877	char *pcEndOfPath = strrchr(_szFilename, '/');	5877	const char *pcEndOfPath = strrchr(_szFilename, '/');
5878	if (pcEndOfPath != NULL)	5878	if (pcEndOfPath != NULL)
5879	m_szFilename = strdup(pcEndOfPath + 1);	5879	m_szFilename = strdup(pcEndOfPath + 1);
5880	else	5880	else




/*-----Helper functions for CLicq::UpgradeLicq-----------------------------*/
int SelectUserUtility(const struct dirent *d)
{
  const char *pcDot = strrchr(d->d_name, '.');
  if (pcDot == NULL) return (0);
  return (strcmp(pcDot, ".uin") == 0);
}

int SelectHistoryUtility(const struct dirent *d)
{
  const char *pcDot = strchr(d->d_name, '.');
  if (pcDot == NULL) return (0);
  return (strcmp(pcDot, ".history") == 0 ||
          strcmp(pcDot, ".history.removed") == 0);

Lines 2141-2147 Link Here

(-)licq-1.3.6.orig/src/rtf.cc (-1 / +1 lines)
2141	return;	2141	return;
2142	}	2142	}
2143	if (m_bFontName){	2143	if (m_bFontName){
2144	char *pp = strchr(str, ';');	2144	const char *pp = strchr(str, ';');
2145	unsigned size = strlen(pp);	2145	unsigned size = strlen(pp);
2146	if (pp){	2146	if (pp){
2147	size = (pp - str);	2147	size = (pp - str);

Lines 541-547 Link Here

(-)licq-1.3.6.orig/src/rtf.ll (-1 / +1 lines)
541	return;	541	return;
542	}	542	}
543	if (m_bFontName){	543	if (m_bFontName){
544	char *pp = strchr(str, ';');	544	const char *pp = strchr(str, ';');
545	unsigned size = strlen(pp);	545	unsigned size = strlen(pp);
546	if (pp){	546	if (pp){
547	size = (pp - str);	547	size = (pp - str);

Lines 76-82 Link Here

(-)licq-1.3.6.orig/src/translate.cpp (-1 / +1 lines)
76	bool CTranslator::setTranslationMap(const char* mapFileName)	76	bool CTranslator::setTranslationMap(const char* mapFileName)
77	{	77	{
78	// Map name is the file name with no path	78	// Map name is the file name with no path
79	char* sep = strrchr(mapFileName, '/');	79	const char* sep = strrchr(mapFileName, '/');
80	const char* mapName = (sep == NULL ? mapFileName : sep + 1);	80	const char* mapName = (sep == NULL ? mapFileName : sep + 1);
81		81
82	if (strcmp(mapName, "LATIN_1") == 0)	82	if (strcmp(mapName, "LATIN_1") == 0)

Lines 46-52 Link Here

(-)licq-1.3.6.orig/src/utility.cpp (-1 / +1 lines)
46	//=====CUtilityManager==========================================================	46	//=====CUtilityManager==========================================================
47	int SelectUtility(const struct dirent *d)	47	int SelectUtility(const struct dirent *d)
48	{	48	{
49	char *pcDot = strrchr(d->d_name, '.');	49	const char *pcDot = strrchr(d->d_name, '.');
50	if (pcDot == NULL) return (0);	50	if (pcDot == NULL) return (0);
51	return (strcmp(pcDot, ".utility") == 0);	51	return (strcmp(pcDot, ".utility") == 0);
52	}	52	}

Return to bug 280640

Lines 183-196 Link Here

(-)licq-1.3.6.orig/src/licq.cpp (-2 / +2 lines)
183	/-----Helper functions for CLicq::UpgradeLicq-----------------------------/	183	/-----Helper functions for CLicq::UpgradeLicq-----------------------------/
184	int SelectUserUtility(const struct dirent *d)	184	int SelectUserUtility(const struct dirent *d)
185	{	185	{
186	char *pcDot = strrchr(d->d_name, '.');	186	const char *pcDot = strrchr(d->d_name, '.');
187	if (pcDot == NULL) return (0);	187	if (pcDot == NULL) return (0);
188	return (strcmp(pcDot, ".uin") == 0);	188	return (strcmp(pcDot, ".uin") == 0);
189	}	189	}
190		190
191	int SelectHistoryUtility(const struct dirent *d)	191	int SelectHistoryUtility(const struct dirent *d)
192	{	192	{
193	char *pcDot = strchr(d->d_name, '.');	193	const char *pcDot = strchr(d->d_name, '.');
194	if (pcDot == NULL) return (0);	194	if (pcDot == NULL) return (0);
195	return (strcmp(pcDot, ".history") == 0 \|\|	195	return (strcmp(pcDot, ".history") == 0 \|\|
196	strcmp(pcDot, ".history.removed") == 0);	196	strcmp(pcDot, ".history.removed") == 0);

Lines 68-74 Link Here

(-)licq-1.3.6.orig/plugins/msn/src/msn-ssl.cpp (-3 / +3 lines)
68	if (strFirstLine == "HTTP/1.1 200 OK")	68	if (strFirstLine == "HTTP/1.1 200 OK")
69	{	69	{
70	m_pSSLPacket->ParseHeaders();	70	m_pSSLPacket->ParseHeaders();
71	char *fromPP = strstr(m_pSSLPacket->GetValue("Authentication-Info").c_str(), "from-PP=");	71	const char *fromPP = strstr(m_pSSLPacket->GetValue("Authentication-Info").c_str(), "from-PP=");
72	char *tag;	72	char *tag;
73		73
74	if (fromPP == 0)	74	if (fromPP == 0)
Lines 76-82 Link Here
76	else	76	else
77	{	77	{
78	fromPP+= 9; // skip to the tag	78	fromPP+= 9; // skip to the tag
79	char *endTag = strchr(fromPP, '\'');	79	const char *endTag = strchr(fromPP, '\'');
80	tag = strndup(fromPP, endTag - fromPP); // Thanks, this is all we need	80	tag = strndup(fromPP, endTag - fromPP); // Thanks, this is all we need
81	}	81	}
82		82
Lines 146-152 Link Here
146		146
147	m_pNexusBuff->ParseHeaders();	147	m_pNexusBuff->ParseHeaders();
148		148
149	char *szLogin = strstr(m_pNexusBuff->GetValue("PassportURLs").c_str(), "DALogin=");	149	const char *szLogin = strstr(m_pNexusBuff->GetValue("PassportURLs").c_str(), "DALogin=");
150	szLogin += 8; // skip to the tag	150	szLogin += 8; // skip to the tag
151	//char *szEndURL = strchr(szLogin, '/');	151	//char *szEndURL = strchr(szLogin, '/');
152	//char *szServer = strndup(szLogin, szEndURL - szLogin); // this is all we need	152	//char *szServer = strndup(szLogin, szEndURL - szLogin); // this is all we need