pidgin: 4fea18d1: Fix some un-fixes in the Zephyr strlcpy ...

elb at pidgin.im elb at pidgin.im
Tue Aug 16 11:11:47 EDT 2011


----------------------------------------------------------------------
Revision: 4fea18d18cfec3ca002a169a312c742a22ac9374
Parent:   ee92442936e7c9d64a01d91e29e075631caf2bd7
Author:   elb at pidgin.im
Date:     08/16/11 11:03:35
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4fea18d18cfec3ca002a169a312c742a22ac9374

Changelog: 

Fix some un-fixes in the Zephyr strlcpy changes

Changes against parent ee92442936e7c9d64a01d91e29e075631caf2bd7

  patched  libpurple/protocols/zephyr/ZInit.c
  patched  libpurple/protocols/zephyr/Zinternal.c

-------------- next part --------------
============================================================
--- libpurple/protocols/zephyr/ZInit.c	bd36bd07d9433eb46c8832b4ecd023866c26deed
+++ libpurple/protocols/zephyr/ZInit.c	15d025b9ed0909ced6ed13cf323899319f97afb6
@@ -108,7 +108,7 @@ Code_t ZInitialize()
 	return (krbval);
     }
 #else
-    g_strlcpy(__Zephyr_realm, "local-realm", 12);
+    g_strlcpy(__Zephyr_realm, "local-realm", REALM_SZ);
 #endif
 
     __My_addr.s_addr = INADDR_NONE;
============================================================
--- libpurple/protocols/zephyr/Zinternal.c	1ac51889c8a53a88cb95997022376d822f734ba5
+++ libpurple/protocols/zephyr/Zinternal.c	be66933c61e3072b69de74986df8c2ac86078871
@@ -767,7 +767,7 @@ Z_AddField(char **ptr, const char *field
     if (*ptr+len > end)
 	return 1;
     if (field)
-      g_strlcpy(*ptr, field, len);
+        strcpy(*ptr, field);
     else
       **ptr = '\0';
     *ptr += len;


More information about the Commits mailing list