From 7547b4b5bd4f687b3601852fb77e3490935c60c6 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Tue, 5 Nov 2013 01:59:56 -0800
Subject: [PATCH] Ticket #452: Fix segfault related to FastPath and pointer
 checks.

---
 configure.ac                     | 10 ++++++++++
 src/protocols/rdp/rdp_settings.c |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/configure.ac b/configure.ac
index 8d2d3903..40d4ef78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -481,6 +481,16 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <freerdp/update.h>
                   [AC_MSG_RESULT([no])
                    AC_DEFINE([LEGACY_RDPPALETTE])])
 
+#
+# FreeRDP: rdpPointer
+#
+
+# Check for SetDefault and SetNull members of rdpPointer
+AC_CHECK_MEMBERS([rdpPointer.SetDefault,
+                  rdpPointer.SetNull],
+                 ,,
+                 [[#include <freerdp/freerdp.h>]])
+
 #
 # FreeRDP: wMessage / RDP_EVENT
 #
diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c
index 92d9088a..2de44252 100644
--- a/src/protocols/rdp/rdp_settings.c
+++ b/src/protocols/rdp/rdp_settings.c
@@ -186,6 +186,8 @@ void guac_rdp_push_settings(guac_rdp_settings* guac_settings, freerdp* rdp) {
     bitmap_cache = rdp_settings->bitmap_cache;
     rdp_settings->os_major_type = OSMAJORTYPE_UNSPECIFIED;
     rdp_settings->os_minor_type = OSMINORTYPE_UNSPECIFIED;
+    rdp_settings->fast_path_input = FALSE;
+    rdp_settings->fast_path_output = FALSE;
     rdp_settings->order_support[NEG_DSTBLT_INDEX] = TRUE;
     rdp_settings->order_support[NEG_PATBLT_INDEX] = FALSE; /* PATBLT not yet supported */
     rdp_settings->order_support[NEG_SCRBLT_INDEX] = TRUE;
@@ -214,6 +216,8 @@ void guac_rdp_push_settings(guac_rdp_settings* guac_settings, freerdp* rdp) {
     bitmap_cache = rdp_settings->BitmapCacheEnabled;
     rdp_settings->OsMajorType = OSMAJORTYPE_UNSPECIFIED;
     rdp_settings->OsMinorType = OSMINORTYPE_UNSPECIFIED;
+    rdp_settings->FastPathInput = FALSE;
+    rdp_settings->FastPathOutput = FALSE;
     rdp_settings->OrderSupport[NEG_DSTBLT_INDEX] = TRUE;
     rdp_settings->OrderSupport[NEG_PATBLT_INDEX] = FALSE; /* PATBLT not yet supported */
     rdp_settings->OrderSupport[NEG_SCRBLT_INDEX] = TRUE;