Merge pull request #8 from kassak/upstream_fixes

Upstream fixes
This commit is contained in:
Jack Moffitt
2013-09-07 06:43:11 -07:00
3 changed files with 4 additions and 3 deletions

View File

@@ -681,7 +681,8 @@ void xmpp_conn_disable_tls(xmpp_conn_t * const conn)
static void _log_open_tag(xmpp_conn_t *conn, char **attrs)
{
char buf[4096];
size_t len, pos;
size_t pos;
int len;
int i;
if (!attrs) return;

View File

@@ -148,7 +148,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
PUT_32BIT_LSB_FIRST(digest + 4, ctx->buf[1]);
PUT_32BIT_LSB_FIRST(digest + 8, ctx->buf[2]);
PUT_32BIT_LSB_FIRST(digest + 12, ctx->buf[3]);
memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
}
#ifndef ASM_MD5

View File

@@ -46,7 +46,7 @@ static void _set_attributes(xmpp_stanza_t *stanza, const xmlChar **attrs)
if (!attrs) return;
for (i = 0; attrs[i]; i += 2) {
xmpp_stanza_set_attribute(stanza, attrs[i], attrs[i+1]);
xmpp_stanza_set_attribute(stanza, (const char *)attrs[i], (const char *)attrs[i+1]);
}
}