Constify key access for hash and formal params

weltling · weltling · commit f24e597c85e0 · 2017-10-19T12:07:08.000+02:00
Keys created in shared memory and won't be modified and are free'd on
restart. Otherwise, keys passed to functions should not be modified,
too.
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -1281,7 +1281,7 @@ int zend_accel_invalidate(const char *filename, size_t filename_len, zend_bool f
 }
 
 /* Adds another key for existing cached script */
-static void zend_accel_add_key(char *key, unsigned int key_length, zend_accel_hash_entry *bucket)
+static void zend_accel_add_key(const char *key, unsigned int key_length, zend_accel_hash_entry *bucket)
 {
 	if (!zend_accel_hash_str_find(&ZCSG(hash), key, key_length)) {
 		if (zend_accel_hash_is_full(&ZCSG(hash))) {
@@ -1360,7 +1360,7 @@ static zend_persistent_script *cache_script_in_file_cache(zend_persistent_script
 }
 #endif
 
-static zend_persistent_script *cache_script_in_shared_memory(zend_persistent_script *new_persistent_script, char *key, unsigned int key_length, int *from_shared_memory)
+static zend_persistent_script *cache_script_in_shared_memory(zend_persistent_script *new_persistent_script, const char *key, unsigned int key_length, int *from_shared_memory)
 {
 	zend_accel_hash_entry *bucket;
 	uint32_t memory_used;
@@ -1550,7 +1550,7 @@ static void zend_accel_init_auto_globals(void)
 	}
 }
 
-static zend_persistent_script *opcache_compile_file(zend_file_handle *file_handle, int type, char *key, zend_op_array **op_array_p)
+static zend_persistent_script *opcache_compile_file(zend_file_handle *file_handle, int type, const char *key, zend_op_array **op_array_p)
 {
 	zend_persistent_script *new_persistent_script;
 	zend_op_array *orig_active_op_array;
diff --git a/ext/opcache/zend_accelerator_hash.c b/ext/opcache/zend_accelerator_hash.c
@@ -71,7 +71,7 @@ void zend_accel_hash_init(zend_accel_hash *accel_hash, uint32_t hash_size)
  * Returns pointer the actual hash entry on success
  * key needs to be already allocated as it is not copied
  */
-zend_accel_hash_entry* zend_accel_hash_update(zend_accel_hash *accel_hash, char *key, uint32_t key_length, zend_bool indirect, void *data)
+zend_accel_hash_entry* zend_accel_hash_update(zend_accel_hash *accel_hash, const char *key, uint32_t key_length, zend_bool indirect, void *data)
 {
 	zend_ulong hash_value;
 	zend_ulong index;
@@ -140,7 +140,7 @@ zend_accel_hash_entry* zend_accel_hash_update(zend_accel_hash *accel_hash, char
 	return entry;
 }
 
-static zend_always_inline void* zend_accel_hash_find_ex(zend_accel_hash *accel_hash, char *key, uint32_t key_length, zend_ulong hash_value, int data)
+static zend_always_inline void* zend_accel_hash_find_ex(zend_accel_hash *accel_hash, const char *key, uint32_t key_length, zend_ulong hash_value, int data)
 {
 	zend_ulong index;
 	zend_accel_hash_entry *entry;
@@ -203,7 +203,7 @@ zend_accel_hash_entry* zend_accel_hash_find_entry(zend_accel_hash *accel_hash, z
 /* Returns the data associated with key on success
  * Returns NULL if data doesn't exist
  */
-void* zend_accel_hash_str_find(zend_accel_hash *accel_hash, char *key, uint32_t key_length)
+void* zend_accel_hash_str_find(zend_accel_hash *accel_hash, const char *key, uint32_t key_length)
 {
 	return zend_accel_hash_find_ex(
 		accel_hash,
@@ -216,7 +216,7 @@ void* zend_accel_hash_str_find(zend_accel_hash *accel_hash, char *key, uint32_t
 /* Returns the hash entry associated with key on success
  * Returns NULL if it doesn't exist
  */
-zend_accel_hash_entry* zend_accel_hash_str_find_entry(zend_accel_hash *accel_hash, char *key, uint32_t key_length)
+zend_accel_hash_entry* zend_accel_hash_str_find_entry(zend_accel_hash *accel_hash, const char *key, uint32_t key_length)
 {
 	return (zend_accel_hash_entry *)zend_accel_hash_find_ex(
 		accel_hash,
@@ -226,7 +226,7 @@ zend_accel_hash_entry* zend_accel_hash_str_find_entry(zend_accel_hash *accel_has
 		0);
 }
 
-int zend_accel_hash_unlink(zend_accel_hash *accel_hash, char *key, uint32_t key_length)
+int zend_accel_hash_unlink(zend_accel_hash *accel_hash, const char *key, uint32_t key_length)
 {
     zend_ulong hash_value;
     zend_ulong index;
diff --git a/ext/opcache/zend_accelerator_hash.h b/ext/opcache/zend_accelerator_hash.h
@@ -46,7 +46,7 @@ typedef struct _zend_accel_hash_entry zend_accel_hash_entry;
 
 struct _zend_accel_hash_entry {
 	zend_ulong             hash_value;
-	char                  *key;
+	const char            *key;
 	uint32_t              key_length;
 	zend_accel_hash_entry *next;
 	void                  *data;
@@ -66,7 +66,7 @@ void zend_accel_hash_clean(zend_accel_hash *accel_hash);
 
 zend_accel_hash_entry* zend_accel_hash_update(
 		zend_accel_hash        *accel_hash,
-		char                   *key,
+		const char             *key,
 		uint32_t               key_length,
 		zend_bool               indirect,
 		void                   *data);
@@ -81,17 +81,17 @@ zend_accel_hash_entry* zend_accel_hash_find_entry(
 
 void* zend_accel_hash_str_find(
 		zend_accel_hash        *accel_hash,
-		char                   *key,
+		const char             *key,
 		uint32_t               key_length);
 
 zend_accel_hash_entry* zend_accel_hash_str_find_entry(
 		zend_accel_hash        *accel_hash,
-		char                   *key,
+		const char             *key,
 		uint32_t               key_length);
 
 int zend_accel_hash_unlink(
 		zend_accel_hash        *accel_hash,
-		char                   *key,
+		const char             *key,
 		uint32_t               key_length);
 
 static inline zend_bool zend_accel_hash_is_full(zend_accel_hash *accel_hash)
diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
@@ -842,7 +842,7 @@ static void zend_accel_persist_class_table(HashTable *class_table)
 	zend_hash_apply(class_table, (apply_func_t) zend_update_parent_ce);
 }
 
-zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script, char **key, unsigned int key_length)
+zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script, const char **key, unsigned int key_length)
 {
 	script->mem = ZCG(mem);
 
diff --git a/ext/opcache/zend_persist.h b/ext/opcache/zend_persist.h
@@ -23,7 +23,7 @@
 #define ZEND_PERSIST_H
 
 int zend_accel_script_persistable(zend_persistent_script *script);
-uint32_t zend_accel_script_persist_calc(zend_persistent_script *script, char *key, unsigned int key_length, int for_shm);
-zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script, char **key, unsigned int key_length);
+uint32_t zend_accel_script_persist_calc(zend_persistent_script *script, const char *key, unsigned int key_length, int for_shm);
+zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script, const char **key, unsigned int key_length);
 
 #endif /* ZEND_PERSIST_H */
diff --git a/ext/opcache/zend_persist_calc.c b/ext/opcache/zend_persist_calc.c
@@ -394,7 +394,7 @@ static void zend_accel_persist_class_table_calc(HashTable *class_table)
 	zend_hash_persist_calc(class_table, zend_persist_class_entry_calc);
 }
 
-uint32_t zend_accel_script_persist_calc(zend_persistent_script *new_persistent_script, char *key, unsigned int key_length, int for_shm)
+uint32_t zend_accel_script_persist_calc(zend_persistent_script *new_persistent_script, const char *key, unsigned int key_length, int for_shm)
 {
 	new_persistent_script->mem = NULL;
 	new_persistent_script->size = 0;

Original file line number	Diff line number	Diff line change
`@@ -1281,7 +1281,7 @@ int zend_accel_invalidate(const char *filename, size_t filename_len, zend_bool f`
`1281`	`1281`	`}`
`1282`	`1282`
`1283`	`1283`	`/* Adds another key for existing cached script */`
`1284`		`-static void zend_accel_add_key(char key, unsigned int key_length, zend_accel_hash_entry bucket)`
	`1284`	`+static void zend_accel_add_key(const char key, unsigned int key_length, zend_accel_hash_entry bucket)`
`1285`	`1285`	`{`
`1286`	`1286`	`if (!zend_accel_hash_str_find(&ZCSG(hash), key, key_length)) {`
`1287`	`1287`	`if (zend_accel_hash_is_full(&ZCSG(hash))) {`
`@@ -1360,7 +1360,7 @@ static zend_persistent_script *cache_script_in_file_cache(zend_persistent_script`
`1360`	`1360`	`}`
`1361`	`1361`	`#endif`
`1362`	`1362`
`1363`		`-static zend_persistent_script cache_script_in_shared_memory(zend_persistent_script new_persistent_script, char key, unsigned int key_length, int from_shared_memory)`
	`1363`	`+static zend_persistent_script cache_script_in_shared_memory(zend_persistent_script new_persistent_script, const char key, unsigned int key_length, int from_shared_memory)`
`1364`	`1364`	`{`
`1365`	`1365`	`zend_accel_hash_entry *bucket;`
`1366`	`1366`	`uint32_t memory_used;`
`@@ -1550,7 +1550,7 @@ static void zend_accel_init_auto_globals(void)`
`1550`	`1550`	`}`
`1551`	`1551`	`}`
`1552`	`1552`
`1553`		`-static zend_persistent_script opcache_compile_file(zend_file_handle file_handle, int type, char key, zend_op_array *op_array_p)`
	`1553`	`+static zend_persistent_script opcache_compile_file(zend_file_handle file_handle, int type, const char key, zend_op_array *op_array_p)`
`1554`	`1554`	`{`
`1555`	`1555`	`zend_persistent_script *new_persistent_script;`
`1556`	`1556`	`zend_op_array *orig_active_op_array;`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ void zend_accel_hash_init(zend_accel_hash *accel_hash, uint32_t hash_size)`
`71`	`71`	`* Returns pointer the actual hash entry on success`
`72`	`72`	`* key needs to be already allocated as it is not copied`
`73`	`73`	`*/`
`74`		`-zend_accel_hash_entry* zend_accel_hash_update(zend_accel_hash accel_hash, char key, uint32_t key_length, zend_bool indirect, void *data)`
	`74`	`+zend_accel_hash_entry* zend_accel_hash_update(zend_accel_hash accel_hash, const char key, uint32_t key_length, zend_bool indirect, void *data)`
`75`	`75`	`{`
`76`	`76`	`zend_ulong hash_value;`
`77`	`77`	`zend_ulong index;`
`@@ -140,7 +140,7 @@ zend_accel_hash_entry* zend_accel_hash_update(zend_accel_hash *accel_hash, char`
`140`	`140`	`return entry;`
`141`	`141`	`}`
`142`	`142`
`143`		`-static zend_always_inline void* zend_accel_hash_find_ex(zend_accel_hash accel_hash, char key, uint32_t key_length, zend_ulong hash_value, int data)`
	`143`	`+static zend_always_inline void* zend_accel_hash_find_ex(zend_accel_hash accel_hash, const char key, uint32_t key_length, zend_ulong hash_value, int data)`
`144`	`144`	`{`
`145`	`145`	`zend_ulong index;`
`146`	`146`	`zend_accel_hash_entry *entry;`
`@@ -203,7 +203,7 @@ zend_accel_hash_entry* zend_accel_hash_find_entry(zend_accel_hash *accel_hash, z`
`203`	`203`	`/* Returns the data associated with key on success`
`204`	`204`	`* Returns NULL if data doesn't exist`
`205`	`205`	`*/`
`206`		`-void* zend_accel_hash_str_find(zend_accel_hash accel_hash, char key, uint32_t key_length)`
	`206`	`+void* zend_accel_hash_str_find(zend_accel_hash accel_hash, const char key, uint32_t key_length)`
`207`	`207`	`{`
`208`	`208`	`return zend_accel_hash_find_ex(`
`209`	`209`	`accel_hash,`
`@@ -216,7 +216,7 @@ void* zend_accel_hash_str_find(zend_accel_hash accel_hash, char key, uint32_t`
`216`	`216`	`/* Returns the hash entry associated with key on success`
`217`	`217`	`* Returns NULL if it doesn't exist`
`218`	`218`	`*/`
`219`		`-zend_accel_hash_entry* zend_accel_hash_str_find_entry(zend_accel_hash accel_hash, char key, uint32_t key_length)`
	`219`	`+zend_accel_hash_entry* zend_accel_hash_str_find_entry(zend_accel_hash accel_hash, const char key, uint32_t key_length)`
`220`	`220`	`{`
`221`	`221`	`return (zend_accel_hash_entry *)zend_accel_hash_find_ex(`
`222`	`222`	`accel_hash,`
`@@ -226,7 +226,7 @@ zend_accel_hash_entry* zend_accel_hash_str_find_entry(zend_accel_hash *accel_has`
`226`	`226`	`0);`
`227`	`227`	`}`
`228`	`228`
`229`		`-int zend_accel_hash_unlink(zend_accel_hash accel_hash, char key, uint32_t key_length)`
	`229`	`+int zend_accel_hash_unlink(zend_accel_hash accel_hash, const char key, uint32_t key_length)`
`230`	`230`	`{`
`231`	`231`	`zend_ulong hash_value;`
`232`	`232`	`zend_ulong index;`
Original file line number	Diff line number	Diff line change
`@@ -842,7 +842,7 @@ static void zend_accel_persist_class_table(HashTable *class_table)`
`842`	`842`	`zend_hash_apply(class_table, (apply_func_t) zend_update_parent_ce);`
`843`	`843`	`}`
`844`	`844`
`845`		`-zend_persistent_script zend_accel_script_persist(zend_persistent_script script, char **key, unsigned int key_length)`
	`845`	`+zend_persistent_script zend_accel_script_persist(zend_persistent_script script, const char **key, unsigned int key_length)`
`846`	`846`	`{`
`847`	`847`	`script->mem = ZCG(mem);`
`848`	`848`
Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ static void zend_accel_persist_class_table_calc(HashTable *class_table)`
`394`	`394`	`zend_hash_persist_calc(class_table, zend_persist_class_entry_calc);`
`395`	`395`	`}`
`396`	`396`
`397`		`-uint32_t zend_accel_script_persist_calc(zend_persistent_script new_persistent_script, char key, unsigned int key_length, int for_shm)`
	`397`	`+uint32_t zend_accel_script_persist_calc(zend_persistent_script new_persistent_script, const char key, unsigned int key_length, int for_shm)`
`398`	`398`	`{`
`399`	`399`	`new_persistent_script->mem = NULL;`
`400`	`400`	`new_persistent_script->size = 0;`