cvs: php4 /ext/sysvshm sysvshm.c

wez Fri Sep 7 08:12:19 2001 EDT Modified files: /php4/ext/sysvshm sysvshm.c Log: Fix for bug #13190 Index: php4/ext/sysvshm/sysvshm.c diff -u php4/ext/sysvshm/sysvshm.c:1.45 php4/ext/sysvshm/sysvshm.c:1.46 --- php4/ext/sysvshm/sysvshm.c:1.45 Sun Aug 5 12:52:29 2001 +++ php4/ext/sysvshm/sysvshm.c Fri Sep 7 08:12:19 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.45 2001/08/05 16:52:29 sas Exp $ */ +/* $Id: sysvshm.c,v 1.46 2001/09/07 12:12:19 wez Exp $ */ /* This has been built and tested on Linux 2.2.14 * @@ -354,14 +354,15 @@ long shm_varpos; total_size=((long)(len+sizeof(sysvshm_chunk)-1)/4)*4+4; /* 4-byte alligment */ + + if((shm_varpos=php_check_shm_data(ptr,key))>0) { + php_remove_shm_data(ptr, shm_varpos); + } if(ptr->free<total_size) { return -1; /* not enough memeory */ } - if((shm_varpos=php_check_shm_data(ptr,key))>0) { - php_remove_shm_data(ptr, shm_varpos); - } shm_var=(sysvshm_chunk*)((char *)ptr+ptr->end); shm_var->key=key; shm_var->length=len;