Attachment #22899 for bug #59194

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

Lines 32-38 Code_t ZInitialize() Link Here

(-)gaim-0.59/src/protocols/zephyr/ZInit.c (-1 / +2 lines)
32	{	32	{
33	struct servent *hmserv;	33	struct servent *hmserv;
34	struct hostent *hostent;	34	struct hostent *hostent;
35	char addr[4], hostname[MAXHOSTNAMELEN];	35	char addr[4], hostname[MAXHOSTNAMELEN+1];
36	struct in_addr servaddr;	36	struct in_addr servaddr;
37	struct sockaddr_in sin;	37	struct sockaddr_in sin;
38	int s, sinsize = sizeof(sin);	38	int s, sinsize = sizeof(sin);
Lines 134-139 Code_t ZInitialize() Link Here
134	* is a pretty broken thing to do, and unfortunately what we	134	* is a pretty broken thing to do, and unfortunately what we
135	* always do on server machines.) */	135	* always do on server machines.) */
136	if (gethostname(hostname, sizeof(hostname)) == 0) {	136	if (gethostname(hostname, sizeof(hostname)) == 0) {
		137	hostname[sizeof(hostname)-1] = '\0';
137	hostent = gethostbyname(hostname);	138	hostent = gethostbyname(hostname);
138	if (hostent && hostent->h_addrtype == AF_INET)	139	if (hostent && hostent->h_addrtype == AF_INET)
139	memcpy(&__My_addr, hostent->h_addr, sizeof(__My_addr));	140	memcpy(&__My_addr, hostent->h_addr, sizeof(__My_addr));




	int i, j = 0;

	bzero(buf, sizeof(buf));
	for (i = 0; i < strlen(msg) && j < sizeof(buf)-2; i++) {
		char hex[3];
		if (msg[i] != '%') {
			buf[j++] = msg[i];


	bzero(buf, sizeof(buf));
	for (i = 0; i < strlen(msg); i++) {
		if (isalnum(msg[i])) {
			if(j+1 >= sizeof(buf)-1) break;
			buf[j++] = msg[i];
		}
		else {
			if(j+3 >= sizeof(buf)-1) break;
			sprintf(buf + j, "%%%02x", (unsigned char)msg[i]);
			j += 3;
		}

Return to bug 59194

Lines 181-187 static char url_decode(const char msg) Link Here

(-)gaim-0.59/src/protocols/msn/msn.c (-2 / +5 lines)
181	int i, j = 0;	181	int i, j = 0;
182		182
183	bzero(buf, sizeof(buf));	183	bzero(buf, sizeof(buf));
184	for (i = 0; i < strlen(msg); i++) {	184	for (i = 0; i < strlen(msg) && j < sizeof(buf)-2; i++) {
185	char hex[3];	185	char hex[3];
186	if (msg[i] != '%') {	186	if (msg[i] != '%') {
187	buf[j++] = msg[i];	187	buf[j++] = msg[i];
Lines 205-213 static char url_encode(const char msg) Link Here
205		205
206	bzero(buf, sizeof(buf));	206	bzero(buf, sizeof(buf));
207	for (i = 0; i < strlen(msg); i++) {	207	for (i = 0; i < strlen(msg); i++) {
208	if (isalnum(msg[i]))	208	if (isalnum(msg[i])) {
		209	if(j+1 >= sizeof(buf)-1) break;
209	buf[j++] = msg[i];	210	buf[j++] = msg[i];
		211	}
210	else {	212	else {
		213	if(j+3 >= sizeof(buf)-1) break;
211	sprintf(buf + j, "%%%02x", (unsigned char)msg[i]);	214	sprintf(buf + j, "%%%02x", (unsigned char)msg[i]);
212	j += 3;	215	j += 3;
213	}	216	}