From ce4e02ae48295063feb57f5d5fe14429d11b2de5 Mon Sep 17 00:00:00 2001
From: Martin Fleisz <mfleisz@thinstuff.at>
Date: Wed, 17 Apr 2013 13:09:53 +0200
Subject: [PATCH] iOS: Fixed possible crash on disconnect

---
 client/iOS/Models/RDPSession.m | 4 +++-
 libfreerdp/crypto/der.c        | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/iOS/Models/RDPSession.m b/client/iOS/Models/RDPSession.m
index af400bb..87a1aaf 100644
--- 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
--- 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;
-- 
2.7.4