Changeset 85271 in vbox for trunk

Timestamp:

Jul 12, 2020 12:36:21 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139248

Message:

Main/HostDnsServiceDarwin.cpp,++: Wrong index types (must use CFIndex). Left a number of TODOs behind. bugref:9790

Location:

trunk/src/VBox/Main/src-server

Files:

• HostDnsService.cpp (modified) (1 diff)
• HostDnsService.h (modified) (1 diff)
• darwin/HostDnsServiceDarwin.cpp (modified) (6 diffs)

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

@@ -69 +69 @@
 }
 
-inline static void detachVectorOfString(const std::vector<std::string>& v,
-                                        std::vector<com::Utf8Str> &aArray)
+DECLINLINE(void) detachVectorOfString(const std::vector<std::string>& v, std::vector<com::Utf8Str> &aArray)
 {
     aArray.resize(v.size());
     size_t i = 0;
     for (std::vector<std::string>::const_iterator it = v.begin(); it != v.end(); ++it, ++i)
-        aArray[i] = Utf8Str(it->c_str());
+        aArray[i] = Utf8Str(it->c_str()); /** @todo r=bird: *it isn't necessarily UTF-8 clean!!
+                                           * On darwin we do silly shit like using CFStringGetSystemEncoding()
+                                           * that may be UTF-8 but doesn't need to be.
+                                           *
+                                           * Why on earth are we using std::string here anyway?
+                                           */
 }
 

trunk/src/VBox/Main/src-server/HostDnsService.h

@@ -38 +38 @@
 class HostDnsInformation
 {
-  public:
+public:
     static const uint32_t IGNORE_SERVER_ORDER = RT_BIT_32(0);
     static const uint32_t IGNORE_SUFFIXES     = RT_BIT_32(1);
 
-  public:
+public:
+    /** @todo r=bird: Why on earth are we using std::string and not Utf8Str?   */
     std::vector<std::string> servers;
     std::string domain;

trunk/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp

@@ -140 +140 @@
     }
 
-    if(SCDynamicStoreSetNotificationKeys(m->m_store, watchingArrayRef, NULL))
+    if (SCDynamicStoreSetNotificationKeys(m->m_store, watchingArrayRef, NULL))
         CFRunLoopAddSource(CFRunLoopGetCurrent(), m->m_DnsWatcher, kCFRunLoopCommonModes);
 
@@ -149 +149 @@
     /* Trigger initial update. */
     int rc = updateInfo();
-    AssertRC(rc); /* Not fatal in release builds. */
+    AssertRC(rc); /* Not fatal in release builds. */  /** @todo r=bird: The function always returns VINF_SUCCESS. */
 
     while (!ASMAtomicReadBool(&m->m_fStop))
@@ -189 +189 @@
 
     HostDnsInformation info;
-    CFStringRef domainNameRef = (CFStringRef)CFDictionaryGetValue(
-       static_cast<CFDictionaryRef>(propertyRef), CFSTR("DomainName"));
-
+    CFStringRef domainNameRef = (CFStringRef)CFDictionaryGetValue(static_cast<CFDictionaryRef>(propertyRef), CFSTR("DomainName"));
     if (domainNameRef)
     {
@@ -199 +197 @@
     }
 
-    int i, arrayCount;
-
-    CFArrayRef serverArrayRef = (CFArrayRef)CFDictionaryGetValue(
-       static_cast<CFDictionaryRef>(propertyRef), CFSTR("ServerAddresses"));
+    CFArrayRef serverArrayRef = (CFArrayRef)CFDictionaryGetValue(static_cast<CFDictionaryRef>(propertyRef),
+                                                                 CFSTR("ServerAddresses"));
     if (serverArrayRef)
     {
-        arrayCount = CFArrayGetCount(serverArrayRef);
-        for (i = 0; i < arrayCount; ++i)
+        CFIndex const cItems = CFArrayGetCount(serverArrayRef);
+        for (CFIndex i = 0; i < cItems; ++i)
         {
             CFStringRef serverAddressRef = (CFStringRef)CFArrayGetValueAtIndex(serverArrayRef, i);
@@ -212 +208 @@
                 continue;
 
+            /** @todo r=bird: This code is messed up as CFStringGetCStringPtr is documented
+             *  to return NULL even if the string is valid.   Furthermore, we must have
+             *  UTF-8 - some joker might decide latin-1 is better here for all we know
+             *  and we'll end up with evil invalid UTF-8 sequences. */
             const char *pszServerAddress = CFStringGetCStringPtr(serverAddressRef, CFStringGetSystemEncoding());
             if (!pszServerAddress)
                 continue;
 
+            /** @todo r=bird: Why on earth are we using std::string and not Utf8Str?   */
             info.servers.push_back(std::string(pszServerAddress));
         }
     }
 
-    CFArrayRef searchArrayRef = (CFArrayRef)CFDictionaryGetValue(
-       static_cast<CFDictionaryRef>(propertyRef), CFSTR("SearchDomains"));
-
+    CFArrayRef searchArrayRef = (CFArrayRef)CFDictionaryGetValue(static_cast<CFDictionaryRef>(propertyRef),
+                                                                 CFSTR("SearchDomains"));
     if (searchArrayRef)
     {
-        arrayCount = CFArrayGetCount(searchArrayRef);
-
-        for (i = 0; i < arrayCount; ++i)
+        CFIndex const cItems = CFArrayGetCount(searchArrayRef);
+        for (CFIndex i = 0; i < cItems; ++i)
         {
             CFStringRef searchStringRef = (CFStringRef)CFArrayGetValueAtIndex(searchArrayRef, i);
@@ -233 +232 @@
                 continue;
 
+            /** @todo r=bird: This code is messed up as CFStringGetCStringPtr is documented
+             *  to return NULL even if the string is valid.   Furthermore, we must have
+             *  UTF-8 - some joker might decide latin-1 is better here for all we know
+             *  and we'll end up with evil invalid UTF-8 sequences. */
             const char *pszSearchString = CFStringGetCStringPtr(searchStringRef, CFStringGetSystemEncoding());
             if (!pszSearchString)
                 continue;
 
+            /** @todo r=bird: Why on earth are we using std::string and not Utf8Str?   */
             info.searchList.push_back(std::string(pszSearchString));
         }