summaryrefslogtreecommitdiff
path: root/other
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2020-05-03 01:09:06 +0100
committeriphydf <iphydf@users.noreply.github.com>2020-05-03 14:13:48 +0000
commit88b90c82259f86470cf6eba8684e8d9b4cd61bc3 (patch)
tree90e052389ffacec791019a096837a670e205b225 /other
parent7b758f66dbc550fa52ed66fd7f8b81f8ed37a94e (diff)
Fix a bug in savedata loading when malloc fails.
Also added a bunch of asserts to tests where they don't check allocs.
Diffstat (limited to 'other')
-rwxr-xr-xother/astyle/format-source8
-rw-r--r--other/bootstrap_daemon/docker/tox-bootstrapd.sha2562
2 files changed, 5 insertions, 5 deletions
diff --git a/other/astyle/format-source b/other/astyle/format-source
index 711823d8..193e335c 100755
--- a/other/astyle/format-source
+++ b/other/astyle/format-source
@@ -49,7 +49,7 @@ apidsl_request() {
49} 49}
50 50
51apidsl_curl() { 51apidsl_curl() {
52 echo "apidsl_curl $@" >&2 52 echo "apidsl_curl $*" >&2
53 apidsl_request "c" <( 53 apidsl_request "c" <(
54 apidsl_request "parse" <( 54 apidsl_request "parse" <(
55 perl -0777 -pe "$TO_JSON" $1)) | perl -0777 -pe "$FROM_JSON" 55 perl -0777 -pe "$TO_JSON" $1)) | perl -0777 -pe "$FROM_JSON"
@@ -68,12 +68,12 @@ set -x
68 68
69wait; wait; wait; wait; wait; wait; wait 69wait; wait; wait; wait; wait; wait; wait
70 70
71if grep '<unresolved>' */*.h; then 71if grep '<unresolved>' ./*/*.h; then
72 echo "error: some apidsl references were unresolved" 72 echo "error: some apidsl references were unresolved"
73 exit 1 73 exit 1
74fi 74fi
75 75
76CC_SOURCES=`find . '(' -name '*.cc' ')'` 76CC_SOURCES=$(find . '(' -name '*.cc' ')')
77CC_SOURCES="$CC_SOURCES toxcore/crypto_core.c" 77CC_SOURCES="$CC_SOURCES toxcore/crypto_core.c"
78CC_SOURCES="$CC_SOURCES toxcore/ping_array.c" 78CC_SOURCES="$CC_SOURCES toxcore/ping_array.c"
79 79
@@ -91,7 +91,7 @@ FIND="$FIND -and -not -wholename './super_donators/*'"
91FIND="$FIND -and -not -wholename './third_party/*'" 91FIND="$FIND -and -not -wholename './third_party/*'"
92FIND="$FIND -and -not -wholename './toxencryptsave/crypto_pwhash*'" 92FIND="$FIND -and -not -wholename './toxencryptsave/crypto_pwhash*'"
93 93
94C_SOURCES=`eval "$FIND"` 94C_SOURCES=$(eval "$FIND")
95 95
96$ASTYLE -n --options=other/astyle/astylerc $C_SOURCES 96$ASTYLE -n --options=other/astyle/astylerc $C_SOURCES
97 97
diff --git a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
index 4d02d38f..82043e0d 100644
--- a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
+++ b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
@@ -1 +1 @@
89df21d6a19a1b6652db5b7e6e9f65ad5f8be8abdca9f58645548b9e0c9383e3 /usr/local/bin/tox-bootstrapd 79c4f7416951d024f95d08e7fc48e127181b7465935cc75b9b3e0ab001bd43b4 /usr/local/bin/tox-bootstrapd