[PHP-CVS] cvs: php-src(PHP_5_2) /ext/session mod_mm.c

[Ilia Alshanetsky]

iliaa           Mon Feb 19 23:53:00 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/session        mod_mm.c 
  Log:
  
  Eliminate strcat() usage.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_mm.c?r1=1.46.2.1.2.1&r2=1.46.2.1.2.2&diff_format=u
Index: php-src/ext/session/mod_mm.c
diff -u php-src/ext/session/mod_mm.c:1.46.2.1.2.1 
php-src/ext/session/mod_mm.c:1.46.2.1.2.2
--- php-src/ext/session/mod_mm.c:1.46.2.1.2.1   Mon Jan  1 09:36:05 2007
+++ php-src/ext/session/mod_mm.c        Mon Feb 19 23:53:00 2007
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: mod_mm.c,v 1.46.2.1.2.1 2007/01/01 09:36:05 sebastian Exp $ */
+/* $Id: mod_mm.c,v 1.46.2.1.2.2 2007/02/19 23:53:00 iliaa Exp $ */
 
 #include "php.h"
 
@@ -253,28 +253,34 @@
 {
        int save_path_len = strlen(PS(save_path));
        int mod_name_len = strlen(sapi_module.name);
+       int euid_len;
        char *ps_mm_path, euid[30];
        int ret;
 
        ps_mm_instance = calloc(sizeof(*ps_mm_instance), 1);
-       if (!ps_mm_instance)
+       if (!ps_mm_instance) {
                return FAILURE;
+       }
 
-       if (!sprintf(euid,"%d", geteuid())) 
+       if (!(euid_len = sprintf(euid,"%d", geteuid()))) {
                return FAILURE;
+       }
                
-    /* Directory + '/' + File + Module Name + Effective UID + \0 */    
-       ps_mm_path = 
emalloc(save_path_len+1+sizeof(PS_MM_FILE)+mod_name_len+strlen(euid)+1);
+       /* Directory + '/' + File + Module Name + Effective UID + \0 */ 
+       ps_mm_path = emalloc(save_path_len + 1 + (sizeof(PS_MM_FILE) - 1) + 
mod_name_len + euid_len + 1);
        
-       memcpy(ps_mm_path, PS(save_path), save_path_len + 1);
-       if (save_path_len > 0 && ps_mm_path[save_path_len - 1] != 
DEFAULT_SLASH) {
+       memcpy(ps_mm_path, PS(save_path), save_path_len);
+       if (PS(save_path)[save_path_len - 1] != DEFAULT_SLASH) {
                ps_mm_path[save_path_len] = DEFAULT_SLASH;
-               ps_mm_path[save_path_len+1] = '\0';
+               save_path_len++;
        }
-       strcat(ps_mm_path, PS_MM_FILE);
-       strcat(ps_mm_path, sapi_module.name);
-       strcat(ps_mm_path, euid);
-       
+       mempcy(ps_mm_path + save_path_len, PS_MM_FILE, sizeof(PS_MM_FILE) - 1);
+       save_path_len += sizeof(PS_MM_FILE) - 1;
+       memcpy(ps_mm_path + save_path_len, sapi_module.name, mod_name_len);
+       save_path_len += mod_name_len;
+       memcpy(ps_mm_path + save_path_len, euid, euid_len);
+       ps_mm_path[save_path_len + euid_len] = '\0';
+
        ret = ps_mm_initialize(ps_mm_instance, ps_mm_path);
                
        efree(ps_mm_path);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php