- /* Skip user finalization if user initialization failed */
- BT_LIB_LOGD("Not finalizing non-initialized message iterator: "
- "%!+i", iterator);
- goto end;
+ /*
+ * If this function is called while the iterator is in the
+ * NON_INITIALIZED state, it means the user initialization
+ * method has either not been called, or has failed. We
+ * therefore don't want to call the user finalization method.
+ * However, the initialization method might have created some
+ * upstream message iterators before failing, so we want to
+ * execute the rest of this function, which unlinks the related
+ * iterators.
+ */
+ call_user_finalize = false;
+ break;