Changeset 94716 in vbox for trunk/src

Timestamp:

Apr 27, 2022 8:27:17 AM (3 years ago)

Author:

vboxsync

Message:

Main/Update check: Fixes for UpdateAgent::i_reportError(). bugref:7983

File:

• trunk/src/VBox/Main/src-server/UpdateAgentImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/UpdateAgentImpl.cpp

@@ -723 +723 @@
 
 /**
- * Reports an error by setting the error info and also information subscribed listeners.
+ * Reports an error by setting the error info and also informs subscribed listeners.
  *
  * @returns HRESULT
@@ -732 +732 @@
 HRESULT UpdateAgent::i_reportError(int vrc, const char *pcszMsgFmt, ...)
 {
+    AssertReturn(pcszMsgFmt && *pcszMsgFmt != '\0', E_INVALIDARG);
+
     va_list va;
     va_start(va, pcszMsgFmt);
 
-    char *psz = NULL;
-    if (RTStrAPrintfV(&psz, pcszMsgFmt, va) <= 0)
-     return E_OUTOFMEMORY;
-
-    LogRel(("Update agent (%s): %s\n", mData.m_strName.c_str(), psz));
-
-    ::FireUpdateAgentErrorEvent(m_EventSource, psz, vrc);
-
-    HRESULT const rc = setErrorVrc(VERR_COM_IPRT_ERROR /** @todo Translate HTTP errors to COM? */, psz);
+    Utf8Str strMsg;
+    HRESULT const rc = strMsg.printfVNoThrow(pcszMsgFmt, va);
+    if (FAILED(rc))
+    {
+        va_end(va);
+        return rc;
+    }
 
     va_end(va);
-    RTStrFree(psz);
-
-    return rc;
+
+    LogRel(("Update agent (%s): %s\n", mData.m_strName.c_str(), strMsg.c_str()));
+
+    ::FireUpdateAgentErrorEvent(m_EventSource, strMsg.c_str(), vrc);
+
+    return setErrorBoth(VERR_COM_IPRT_ERROR, vrc, strMsg.c_str());
 }