mirror of https://github.com/oxen-io/lokinet
Rediff patches
Drop 0009-cherry-picked-libabyss-read-fix.patch: <REASON> Drop 0008-Disable-failing-1024-test.patch: <REASON>ubuntu/groovy
parent
6b950e9662
commit
5208daec10
@ -1,24 +0,0 @@
|
||||
From: Jason Rhinelander <jason@imaginary.ca>
|
||||
Date: Sat, 14 Dec 2019 00:02:18 -0400
|
||||
Subject: Disable failing 1024 test
|
||||
|
||||
This test is testing a value that isn't actually used. Why it is
|
||||
failing is a mystery.
|
||||
---
|
||||
test/util/test_llarp_util_aligned.cpp | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/test/util/test_llarp_util_aligned.cpp b/test/util/test_llarp_util_aligned.cpp
|
||||
index 3dfa7ab..840c99e 100644
|
||||
--- a/test/util/test_llarp_util_aligned.cpp
|
||||
+++ b/test/util/test_llarp_util_aligned.cpp
|
||||
@@ -14,8 +14,7 @@ using TestSizes =
|
||||
std::integral_constant< std::size_t, 8 >,
|
||||
std::integral_constant< std::size_t, 16 >,
|
||||
std::integral_constant< std::size_t, 32 >,
|
||||
- std::integral_constant< std::size_t, 64 >,
|
||||
- std::integral_constant< std::size_t, 1024 > >;
|
||||
+ std::integral_constant< std::size_t, 64 > >;
|
||||
|
||||
template < typename T >
|
||||
struct AlignedBufferTest : public ::testing::Test
|
@ -1,25 +0,0 @@
|
||||
From: Jason Rhinelander <jason@imaginary.ca>
|
||||
Date: Sun, 15 Dec 2019 13:20:56 -0400
|
||||
Subject: cherry-picked libabyss read fix
|
||||
|
||||
---
|
||||
llarp/util/json.cpp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/llarp/util/json.cpp b/llarp/util/json.cpp
|
||||
index 9c9358c..ef569c1 100644
|
||||
--- a/llarp/util/json.cpp
|
||||
+++ b/llarp/util/json.cpp
|
||||
@@ -23,9 +23,11 @@ namespace llarp
|
||||
bool
|
||||
FeedData(const char* buf, size_t sz) override
|
||||
{
|
||||
+ if(sz == 0)
|
||||
+ return true;
|
||||
if(m_Offset + sz > m_Buf.size() - 1)
|
||||
return false;
|
||||
- std::copy(buf, buf + sz, m_Buf.begin());
|
||||
+ std::copy_n(buf, sz, m_Buf.data() + m_Offset);
|
||||
m_Offset += sz;
|
||||
m_Buf[m_Offset] = 0;
|
||||
return true;
|
Loading…
Reference in New Issue