HGKeeper

~~--- a/libpurple/protocols/mxit/protocol.c Fri Jun 03 12:57:02 2016 -0500~~

+++ b/libpurple/protocols/mxit/protocol.c Fri Jun 03 12:57:17 2016 -0500

@@ -148,6 +148,34 @@

}

+/*------------------------------------------------------------------------

+ * scnprintf

+ *

+ * @param string The destination buffer.

+ * @param size The maximum size of the destination buffer.

+ * @param format The format string

+ * @param ... The parameters to the format string.

+ * @return The number of characters actually stored in the buffer.

+ */

+static int scnprintf( gchar* string, size_t size, const char *format, ... )

+ va_list args;

+ guint i;

+ va_start( args, format );

+ i = g_vsnprintf( string, size, format, args );

+ va_end( args );

+ if ( i < size )

+ return i;

+ else if ( size > 0 ) /* destination buffer too short - return number of characters actually inserted */

+ return size - 1;

+ else

+ return 0;

/*========================================================================================================================

* Low-level Packet transmission

@@ -462,23 +490,23 @@

packet->headerlen = 0;

/* create generic packet header */

~~- hlen = g_snprintf( header, sizeof( header ), "id=%s%c", purple_account_get_username( session->acc ), CP_REC_TERM ); /* client mxitid */~~

+ hlen = scnprintf( header, sizeof( header ), "id=%s%c", purple_account_get_username( session->acc ), CP_REC_TERM ); /* client mxitid */

if ( session->http ) {

/* http connection only */

~~- hlen += g_snprintf( header + hlen, sizeof( header ) - hlen, "s=" );~~

+ hlen += scnprintf( header + hlen, sizeof( header ) - hlen, "s=" );

if ( session->http_sesid > 0 ) {

~~- hlen += g_snprintf( header + hlen, sizeof( header ) - hlen, "%u%c", session->http_sesid, CP_FLD_TERM ); /* http session id */~~

+ hlen += scnprintf( header + hlen, sizeof( header ) - hlen, "%u%c", session->http_sesid, CP_FLD_TERM ); /* http session id */

}

session->http_seqno++;

~~- hlen += g_snprintf( header + hlen, sizeof( header ) - hlen, "%u%c", session->http_seqno, CP_REC_TERM ); /* http request sequence id */~~

+ hlen += scnprintf( header + hlen, sizeof( header ) - hlen, "%u%c", session->http_seqno, CP_REC_TERM ); /* http request sequence id */

}

~~- hlen += g_snprintf( header + hlen, sizeof( header ) - hlen, "cm=%i%c", cmd, CP_REC_TERM ); /* packet command */~~

+ hlen += scnprintf( header + hlen, sizeof( header ) - hlen, "cm=%i%c", cmd, CP_REC_TERM ); /* packet command */

if ( !session->http ) {

/* socket connection only */

~~- packet->headerlen = g_snprintf( packet->header, sizeof( packet->header ), "ln=%i%c", ( datalen + hlen ), CP_REC_TERM ); /* packet length */~~

+ packet->headerlen = scnprintf( packet->header, sizeof( packet->header ), "ln=%i%c", ( datalen + hlen ), CP_REC_TERM ); /* packet length */

}

/* copy the header to packet */

@@ -709,7 +737,7 @@

clientVersion = g_strdup_printf( "%c-%i.%i.%i-%s-%s", MXIT_CP_DISTCODE, PURPLE_MAJOR_VERSION, PURPLE_MINOR_VERSION, PURPLE_MICRO_VERSION, MXIT_CP_ARCH, MXIT_CP_PLATFORM );

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%s%c%s%c%i%c%s%c" /* "ms"=password\1version\1maxreplyLen\1name\1 */

"%s%c%i%c%s%c%s%c" /* dateOfBirth\1gender\1location\1capabilities\1 */

"%s%c%i%c%s%c%s" /* dc\1features\1dialingcode\1locale */

@@ -747,7 +775,7 @@

clientVersion = g_strdup_printf( "%c-%i.%i.%i-%s-%s", MXIT_CP_DISTCODE, PURPLE_MAJOR_VERSION, PURPLE_MINOR_VERSION, PURPLE_MICRO_VERSION, MXIT_CP_ARCH, MXIT_CP_PLATFORM );

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%s%c%s%c%i%c" /* "ms"=password\1version\1getContacts\1 */

"%s%c%s%c%i%c" /* capabilities\1dc\1features\1 */

"%s%c%s%c" /* dialingcode\1locale\1 */

@@ -761,7 +789,7 @@

/* include "custom resource" information */

splashId = splash_current( session );

if ( splashId != NULL )

~~- datalen += g_snprintf( data + datalen, sizeof( data ) - datalen, "%ccr=%s", CP_REC_TERM, splashId );~~

+ datalen += scnprintf( data + datalen, sizeof( data ) - datalen, "%ccr=%s", CP_REC_TERM, splashId );

/* queue packet for transmission */

mxit_queue_packet( session, data, datalen, CP_CMD_LOGIN );

@@ -791,7 +819,7 @@

markuped_msg = g_strdup( msg );

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%s%c%s%c%i%c%i", /* "ms"=jid\1msg\1type\1flags */

to, CP_FLD_TERM, markuped_msg, CP_FLD_TERM, msgtype, CP_FLD_TERM, CP_MSG_MARKUP | CP_MSG_EMOTICON

);

@@ -818,14 +846,14 @@

int datalen;

unsigned int i;

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%s%c%i", /* "ms="mxitid\1nr_attributes */

( username ? username : "" ), CP_FLD_TERM, nr_attrib

);

/* add attributes */

for ( i = 0; i < nr_attrib; i++ )

~~- datalen += g_snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, attribute[i] );~~

+ datalen += scnprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, attribute[i] );

/* queue packet for transmission */

mxit_queue_packet( session, data, datalen, CP_CMD_EXTPROFILE_GET );

@@ -851,7 +879,7 @@

parts = g_strsplit( attributes, "\01", 1 + ( nr_attrib * 3 ) );

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%s%c%i", /* "ms"=password\1nr_attibutes */

( password ) ? password : "", CP_FLD_TERM, nr_attrib

);

@@ -863,7 +891,7 @@

g_strfreev( parts );

return;

}

~~- datalen += g_snprintf( data + datalen, sizeof( data ) - datalen,~~

+ datalen += scnprintf( data + datalen, sizeof( data ) - datalen,

"%c%s%c%s%c%s", /* \1name\1type\1value */

CP_FLD_TERM, parts[i], CP_FLD_TERM, parts[i + 1], CP_FLD_TERM, parts[i + 2] );

}

@@ -891,13 +919,13 @@

unsigned int i;

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%i%c%s%c%i%c%i%c%i", /* inputType \1 input \1 maxSuggestions \1 startIndex \1 numAttributes \1 name0 \1 name1 ... \1 nameN */

CP_SUGGEST_FRIENDS, CP_FLD_TERM, "", CP_FLD_TERM, max, CP_FLD_TERM, 0, CP_FLD_TERM, nr_attrib );

/* add attributes */

for ( i = 0; i < nr_attrib; i++ )

~~- datalen += g_snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, attribute[i] );~~

+ datalen += scnprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, attribute[i] );

/* queue packet for transmission */

mxit_queue_packet( session, data, datalen, CP_CMD_SUGGESTCONTACTS );

@@ -920,13 +948,13 @@

unsigned int i;

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%i%c%s%c%i%c%i%c%i", /* inputType \1 input \1 maxSuggestions \1 startIndex \1 numAttributes \1 name0 \1 name1 ... \1 nameN */

CP_SUGGEST_SEARCH, CP_FLD_TERM, text, CP_FLD_TERM, max, CP_FLD_TERM, 0, CP_FLD_TERM, nr_attrib );

/* add attributes */

for ( i = 0; i < nr_attrib; i++ )

~~- datalen += g_snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, attribute[i] );~~

+ datalen += scnprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, attribute[i] );

/* queue packet for transmission */

mxit_queue_packet( session, data, datalen, CP_CMD_SUGGESTCONTACTS );

@@ -946,14 +974,14 @@

int datalen;

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%i%c", /* "ms"=show\1status */

presence, CP_FLD_TERM

);

/* append status message (if one is set) */

if ( statusmsg )

~~- datalen += g_snprintf( data + datalen, sizeof( data ) - datalen, "%s", statusmsg );~~

+ datalen += scnprintf( data + datalen, sizeof( data ) - datalen, "%s", statusmsg );

/* queue packet for transmission */

mxit_queue_packet( session, data, datalen, CP_CMD_STATUS );

@@ -972,7 +1000,7 @@

int datalen;

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%i", /* "ms"=mood */

mood

);

@@ -998,7 +1026,7 @@

int datalen;

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%s%c%s%c%s%c%i%c%s%c%i", /* "ms"=group \1 username \1 alias \1 type \1 msg \1 isuserid */

groupname, CP_FLD_TERM, username, CP_FLD_TERM, alias,

CP_FLD_TERM, MXIT_TYPE_MXIT, CP_FLD_TERM,

@@ -1023,7 +1051,7 @@

int datalen;

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%s", /* "ms"=username */

username

);

@@ -1046,7 +1074,7 @@

int datalen;

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%s%c%s%c%s", /* "ms"=username\1group\1alias */

username, CP_FLD_TERM, "", CP_FLD_TERM, alias

);

@@ -1069,14 +1097,14 @@

int datalen;

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%s", /* "ms"=username */

username

);

/* append reason (if one is set) */

if ( reason )

~~- datalen += g_snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, reason );~~

+ datalen += scnprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, reason );

/* queue packet for transmission */

mxit_queue_packet( session, data, datalen, CP_CMD_DENY );

@@ -1097,7 +1125,7 @@

int datalen;

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%s%c%s%c%s", /* "ms"=groupname\1username\1alias */

groupname, CP_FLD_TERM, username, CP_FLD_TERM, alias

);

@@ -1119,7 +1147,7 @@

int datalen;

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%s", /* "ms"=splashId */

splashid

);

@@ -1145,7 +1173,7 @@

purple_debug_info( MXIT_PLUGIN_ID, "mxit_send_msgevent: to=%s id=%s event=%i\n", to, id, event );

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%s%c%s%c%i", /* "ms"=contactAddress \1 id \1 event */

to, CP_FLD_TERM, id, CP_FLD_TERM, event

);

@@ -1170,14 +1198,14 @@

int i;

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%s%c%i", /* "ms"=roomname\1nr_jids\1jid0\1..\1jidN */

groupname, CP_FLD_TERM, nr_usernames

);

/* add usernames */

for ( i = 0; i < nr_usernames; i++ )

~~- datalen += g_snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, usernames[i] );~~

+ datalen += scnprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, usernames[i] );

/* queue packet for transmission */

mxit_queue_packet( session, data, datalen, CP_CMD_GRPCHAT_CREATE );

@@ -1199,14 +1227,14 @@

int i;

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ),~~

+ datalen = scnprintf( data, sizeof( data ),

"ms=%s%c%i", /* "ms"=roomid\1nr_jids\1jid0\1..\1jidN */

roomid, CP_FLD_TERM, nr_usernames

);

/* add usernames */

for ( i = 0; i < nr_usernames; i++ )

~~- datalen += g_snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, usernames[i] );~~

+ datalen += scnprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, usernames[i] );

/* queue packet for transmission */

mxit_queue_packet( session, data, datalen, CP_CMD_GRPCHAT_INVITE );

@@ -1232,7 +1260,7 @@

purple_debug_info( MXIT_PLUGIN_ID, "SENDING FILE '%s' of %i bytes to user '%s'\n", filename, buflen, username );

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ), "ms=" );~~

+ datalen = scnprintf( data, sizeof( data ), "ms=" );

/* map chunk header over data buffer */

chunk = &data[datalen];

@@ -1268,7 +1296,7 @@

purple_debug_info( MXIT_PLUGIN_ID, "mxit_send_file_reject\n" );

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ), "ms=" );~~

+ datalen = scnprintf( data, sizeof( data ), "ms=" );

/* map chunk header over data buffer */

chunk = &data[datalen];

@@ -1306,7 +1334,7 @@

purple_debug_info( MXIT_PLUGIN_ID, "mxit_send_file_accept\n" );

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ), "ms=" );~~

+ datalen = scnprintf( data, sizeof( data ), "ms=" );

/* map chunk header over data buffer */

chunk = &data[datalen];

@@ -1342,7 +1370,7 @@

purple_debug_info( MXIT_PLUGIN_ID, "mxit_send_file_received\n" );

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ), "ms=" );~~

+ datalen = scnprintf( data, sizeof( data ), "ms=" );

/* map chunk header over data buffer */

chunk = &data[datalen];

@@ -1379,7 +1407,7 @@

purple_debug_info( MXIT_PLUGIN_ID, "mxit_set_avatar: %i bytes\n", avatarlen );

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ), "ms=" );~~

+ datalen = scnprintf( data, sizeof( data ), "ms=" );

/* map chunk header over data buffer */

chunk = &data[datalen];

@@ -1418,7 +1446,7 @@

purple_debug_info( MXIT_PLUGIN_ID, "mxit_get_avatar: %s\n", mxitId );

/* convert the packet to a byte stream */

~~- datalen = g_snprintf( data, sizeof( data ), "ms=" );~~

+ datalen = scnprintf( data, sizeof( data ), "ms=" );

/* map chunk header over data buffer */

chunk = &data[datalen];

pidgin/pidgin