More IMAP fixes

1 files changed, 17 insertions, 2 deletions

diff --git a/ext/imap/imap.c b/ext/imap/imap.c
index d2a9f15de6..82bef45ad1 100644
--- a/ext/imap/imap.c
+++ b/ext/imap/imap.c
@@ -182,12 +182,27 @@ MAILSTREAM *mail_close_it (pils *imap_le_struct)
 
 inline int add_assoc_object(pval *arg, char *key, pval *tmp)
 {
-	return _php3_hash_update(arg->value.ht, key, strlen(key)+1, (void *) &tmp, sizeof(pval *), NULL);
+	HashTable *symtable;
+	
+	if (arg->type == IS_OBJECT) {
+		symtable = arg->value.obj.properties;
+	} else {
+		symtable = arg->value.ht;
+	}
+	return _php3_hash_update(symtable, key, strlen(key)+1, (void *) &tmp, sizeof(pval *), NULL);
 }
 
 inline int add_next_index_object(pval *arg, pval *tmp)
 {
-	return _php3_hash_next_index_insert( arg->value.ht, (void *) &tmp, sizeof(pval *), NULL); 
+	HashTable *symtable;
+	
+	if (arg->type == IS_OBJECT) {
+		symtable = arg->value.obj.properties;
+	} else {
+		symtable = arg->value.ht;
+	}
+
+	return _php3_hash_next_index_insert(symtable, (void *) &tmp, sizeof(pval *), NULL); 
 }