From ef9788a0a14ab0d5126c45fa5b2111bcba3c82e0 Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Mon, 25 Jul 2011 13:49:12 -0700 Subject: [PATCH 1/2] drop cmake min version to 2.6 for now --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1a5c2ea9..635c3c527 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.6) project(FreeRDP C) set(CMAKE_COLOR_MAKEFILE ON) From 5f7b50f9024bad3b470a697ced363671fb18c21e Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Mon, 25 Jul 2011 13:50:00 -0700 Subject: [PATCH 2/2] fix crash when registry file is not opened --- libfreerdp-core/registry.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libfreerdp-core/registry.c b/libfreerdp-core/registry.c index e25637aed..82a531781 100644 --- a/libfreerdp-core/registry.c +++ b/libfreerdp-core/registry.c @@ -86,6 +86,11 @@ void registry_print(rdpRegistry* registry, FILE* fp) void registry_create(rdpRegistry* registry) { registry->fp = fopen(registry->file, "w+"); + if (registry->fp == NULL) + { + printf("registry_create: error opening [%s] for writing\n", registry->file); + return; + } registry_print(registry, registry->fp); fflush(registry->fp); }