Index: res/res_xmpp.c =================================================================== --- res/res_xmpp.c (revision 374095) +++ res/res_xmpp.c (working copy) @@ -3142,8 +3142,12 @@ } if ((node && strcmp(resource->caps.node, node)) || (ver && strcmp(resource->caps.version, ver))) { - ast_copy_string(resource->caps.node, node, sizeof(resource->caps.node)); - ast_copy_string(resource->caps.version, ver, sizeof(resource->caps.version)); + if (node) { + ast_copy_string(resource->caps.node, node, sizeof(resource->caps.node)); + } + if (ver) { + ast_copy_string(resource->caps.version, ver, sizeof(resource->caps.version)); + } /* Google Talk places the capabilities information directly in presence, so see if it is there */ if (iks_find_with_attrib(pak->x, "c", "node", "http://www.google.com/xmpp/client/caps") ||