OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'krille/fix-missing-null-check' into 'main' 

fix: Missing null check which F*cks me up!

See merge request famedly/famedlysdk!563
This commit is contained in:
Nicolas Werner 2020-12-14 13:24:39 +00:00
parent bd0c9b0e91 d3c44687f6
commit 03eba89297
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -17,7 +17,7 @@ coverage:
- sed -i s/#//g pubspec.yaml - sed -i s/#//g pubspec.yaml
- flutter doctor - flutter doctor
- apt update - apt update
- apt install -y chromium lcov libolm3 sqlite3 libsqlite3-dev - apt install -y chromium-bsu lcov libolm3 sqlite3 libsqlite3-dev
- ln -s /usr/lib/dart/bin/pub /usr/bin/ - ln -s /usr/lib/dart/bin/pub /usr/bin/
- useradd -m test - useradd -m test
- chown -R 'test:' '.' - chown -R 'test:' '.'
@ -62,7 +62,7 @@ e2ee_test:
- curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - - curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
- curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list - curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list
- apt update - apt update
- apt install -y dart chromium lcov libolm3 sqlite3 libsqlite3-dev - apt install -y dart chromium-bsu lcov libolm3 sqlite3 libsqlite3-dev
- ln -s /usr/lib/dart/bin/pub /usr/bin/ - ln -s /usr/lib/dart/bin/pub /usr/bin/
- useradd -m test - useradd -m test
- chown -R 'test:' '.' - chown -R 'test:' '.'

1
lib/src/utils/device_keys_list.dart
View File

@ -184,6 +184,7 @@ abstract class SignableKey extends MatrixSignableKey {
return false; // prevent recursion & validate hasValidSignatureChain return false; // prevent recursion & validate hasValidSignatureChain
} }
visited.add(setKey); visited.add(setKey);
if (signatures == null) return false;
for (final signatureEntries in signatures.entries) { for (final signatureEntries in signatures.entries) {
final otherUserId = signatureEntries.key; final otherUserId = signatureEntries.key;
if (!(signatureEntries.value is Map) || if (!(signatureEntries.value is Map) ||