iOS: Fixed possible crash on disconnect

diff --git a/client/iOS/Models/RDPSession.m b/client/iOS/Models/RDPSession.m
index af400bb..87a1aaf 100644 (file)
--- a/client/iOS/Models/RDPSession.m
+++ b/client/iOS/Models/RDPSession.m
@@ -190,7 +190,9 @@ NSString* TSXSessionDidFailToConnectNotification = @"TSXSessionDidFailToConnect"
 
 - (CGContextRef)bitmapContext
 {
-       return [self mfi]->bitmap_context;
+    if ([self mfi]->connection_state == TSXConnectionConnected)
+        return [self mfi]->bitmap_context;
+    return NULL;
 }
 
 #pragma mark -

diff --git a/libfreerdp/crypto/der.c b/libfreerdp/crypto/der.c
index 7c4694f..1cc5eb7 100644 (file)
--- a/libfreerdp/crypto/der.c
+++ b/libfreerdp/crypto/der.c
@@ -27,9 +27,9 @@
 
 int _der_skip_length(int length)
 {
-       if (length > 0x81 && length <= 0x102)
+       if (length > 0x7F && length <= 0xFF)
                return 2;
-       else if (length > 0x102)
+       else if (length > 0xFF)
                return 3;
        else
                return 1;