Apply suggestions from code review

Signed-off-by: Madelyn Olson <madelyneolson@gmail.com>

src/defrag.c

@@ -238,14 +238,14 @@ static sds activeDefragSds(sds sdsptr) {
  * caller's responsibility.  This is necessary for string objects with multiple references.  In this
  * case the caller can fix the references before freeing the original object.
  */
-static robj *activeDefragStringObWithoutFree(robj *ob) {
+static robj *activeDefragStringObWithoutFree(robj *ob, size_t *allocation_size) {
     if (ob->type == OBJ_STRING && ob->encoding == OBJ_ENCODING_RAW) {
         // Try to defrag the linked sds, regardless of if robj will be moved
         sds newsds = activeDefragSds((sds)ob->ptr);
         if (newsds) ob->ptr = newsds;
     }
 
-    robj *new_robj = activeDefragAllocWithoutFree(ob, NULL);
+    robj *new_robj = activeDefragAllocWithoutFree(ob, allocation_size);
 
     if (new_robj && ob->type == OBJ_STRING && ob->encoding == OBJ_ENCODING_EMBSTR) {
         // If the robj is moved, correct the internal pointer
@@ -858,7 +858,8 @@ static void defragPubsubScanCallback(void *privdata, const dictEntry *de) {
 
     /* Try to defrag the channel name. */
     serverAssert(channel->refcount == (int)dictSize(clients) + 1);
-    newchannel = activeDefragStringObWithoutFree(channel);
+    size_t size;
+    newchannel = activeDefragStringObWithoutFree(channel, &size);
     if (newchannel) {
         kvstoreDictSetKey(pubsub_channels, ctx->kvstate.slot, (dictEntry *)de, newchannel);
 
@@ -876,7 +877,7 @@ static void defragPubsubScanCallback(void *privdata, const dictEntry *de) {
         }
         dictReleaseIterator(di);
         // Now that we're done correcting the references, we can safely free the old channel robj
-        zfree_no_tcache(channel);
+        allocatorDefragFree(channel, size);
     }
 
     /* Try to defrag the dictionary of clients that is stored as the value part. */