1 files changed, 15 insertions, 10 deletions
diff --git a/Swiften/Network/DomainNameServiceQuery.cpp b/Swiften/Network/DomainNameServiceQuery.cpp
index 548c837..5784dd7 100644
--- a/Swiften/Network/DomainNameServiceQuery.cpp
+++ b/Swiften/Network/DomainNameServiceQuery.cpp
@@ -43,16 +43,21 @@ void DomainNameServiceQuery::sortResults(std::vector<DomainNameServiceQuery::Res
                /* easy hack to account for '0' weights getting at least some weight */
                return result.weight + 1;
            });
-            for (int j = 0; j < boost::numeric_cast<int>(weights.size() - 1); ++j) {
+            try {
-                std::vector<int> cumulativeWeights;
+                for (int j = 0; j < boost::numeric_cast<int>(weights.size()) - 1; ++j) {
-                std::partial_sum(
+                    std::vector<int> cumulativeWeights;
-                        weights.begin() + j,
+                    std::partial_sum(
-                        weights.end(),
+                            weights.begin() + j,
-                        std::back_inserter(cumulativeWeights));
+                            weights.end(),
-                int randomNumber = generator.generateRandomInteger(cumulativeWeights.back());
+                            std::back_inserter(cumulativeWeights));
-                auto selectedIndex = std::lower_bound(cumulativeWeights.begin(), cumulativeWeights.end(), randomNumber) - cumulativeWeights.begin();
+                    int randomNumber = generator.generateRandomInteger(cumulativeWeights.back());
-                std::swap(i[j], i[j + selectedIndex]);
+                    auto selectedIndex = std::lower_bound(cumulativeWeights.begin(), cumulativeWeights.end(), randomNumber) - cumulativeWeights.begin();
-                std::swap(weights.begin()[j], weights.begin()[j + selectedIndex]);
+                    std::swap(i[j], i[j + selectedIndex]);
+                    std::swap(weights.begin()[j], weights.begin()[j + selectedIndex]);
+                }
+            }
+            catch (const boost::numeric::bad_numeric_cast&) {
+                // In the unlikely event of weights.size() being too large, use the list as-is.
            }
        }
        i = next;

diff --git a/Swiften/Network/DomainNameServiceQuery.cpp b/Swiften/Network/DomainNameServiceQuery.cpp index 548c837..5784dd7 100644 --- a/Swiften/Network/DomainNameServiceQuery.cpp +++ b/Swiften/Network/DomainNameServiceQuery.cpp
@@ -43,16 +43,21 @@ void DomainNameServiceQuery::sortResults(std::vector<DomainNameServiceQuery::Res
43	/* easy hack to account for '0' weights getting at least some weight */	43	/* easy hack to account for '0' weights getting at least some weight */
44	return result.weight + 1;	44	return result.weight + 1;
45	});	45	});
46	for (int j = 0; j < boost::numeric_cast<int>(weights.size() - 1); ++j) {	46	try {
47	std::vector<int> cumulativeWeights;	47	for (int j = 0; j < boost::numeric_cast<int>(weights.size()) - 1; ++j) {
48	std::partial_sum(	48	std::vector<int> cumulativeWeights;
49	weights.begin() + j,	49	std::partial_sum(
50	weights.end(),	50	weights.begin() + j,
51	std::back_inserter(cumulativeWeights));	51	weights.end(),
52	int randomNumber = generator.generateRandomInteger(cumulativeWeights.back());	52	std::back_inserter(cumulativeWeights));
53	auto selectedIndex = std::lower_bound(cumulativeWeights.begin(), cumulativeWeights.end(), randomNumber) - cumulativeWeights.begin();	53	int randomNumber = generator.generateRandomInteger(cumulativeWeights.back());
54	std::swap(i[j], i[j + selectedIndex]);	54	auto selectedIndex = std::lower_bound(cumulativeWeights.begin(), cumulativeWeights.end(), randomNumber) - cumulativeWeights.begin();
55	std::swap(weights.begin()[j], weights.begin()[j + selectedIndex]);	55	std::swap(i[j], i[j + selectedIndex]);
		56	std::swap(weights.begin()[j], weights.begin()[j + selectedIndex]);
		57	}
		58	}
		59	catch (const boost::numeric::bad_numeric_cast&) {
		60	// In the unlikely event of weights.size() being too large, use the list as-is.
56	}	61	}
57	}	62	}
58	i = next;	63	i = next;