spaced30/freerdp
SHA256
1
0
Fork 0
forked from pool/freerdp
Code Pull Requests Activity

Accepting request 238357 from home:zhangxiaofei:branches:X11:RemoteDesktop

Browse Source 
CVE-2014-0791, bnc#863929

OBS-URL: https://build.opensuse.org/request/show/238357
OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/freerdp?expand=0&rev=45
This commit is contained in:
Bruno Friedmann 2014-06-24 06:55:47 +00:00 committed by Git OBS Bridge
parent 09f1d77183
commit e14b8e093f
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
freerdp-CVE-2014-0791.patch Normal file
View File

@ -0,0 +1,25 @@
From 5253b9e27a2de48564f9b41eb3643a8edf11afe9 Mon Sep 17 00:00:00 2001
From: Felix Zhang <fezhang@suse.com>
Date: Mon, 23 Jun 2014 12:57:55 +0800
Subject: [PATCH] CVE-2014-0791
---
libfreerdp-core/license.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libfreerdp-core/license.c b/libfreerdp-core/license.c
index 60b9f93..2425ddc 100644
--- a/libfreerdp-core/license.c
+++ b/libfreerdp-core/license.c
@@ -539,6 +539,8 @@ void license_read_scope_list(STREAM* s, SCOPE_LIST* scopeList)
uint32 scopeCount;
stream_read_uint32(s, scopeCount); /* ScopeCount (4 bytes) */
+ if (scopeCount > stream_get_left(s) / 4) /* every blob is at least 4 bytes */
+ return;
scopeList->count = scopeCount;
scopeList->array = (LICENSE_BLOB*) xmalloc(sizeof(LICENSE_BLOB) * scopeCount);
--
1.7.12.4

7
freerdp.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jun 23 03:05:37 UTC 2014 - fezhang@suse.com
- Add freerdp-CVE-2014-0791.patch to fix bnc#857491
backported from upstream commit:
https://github.com/FreeRDP/FreeRDP/commit/f1d6afca6ae620f9855a33280bdc6f3ad9153be0#diff-b6d68bbca6e0f5875c57ef225cd65c45
-------------------------------------------------------------------
Thu Jun 12 20:50:36 UTC 2014 - dliang@suse.com

2
freerdp.spec
View File

@ -35,6 +35,7 @@ Patch4: freerdp-handle-null-device-name.patch
Patch5: freerdp_branch-1.0.x_fix-kpdivide-issue831.patch
# PATCH-FIX-UPSTREAM freerdp-CVE-2014-0250.patch bnc#880317 dliang@suse.com - backport from upstream
Patch6: freerdp-CVE-2014-0250.patch
Patch7: freerdp-CVE-2014-0791.patch
BuildRequires: alsa-devel
BuildRequires: cmake
BuildRequires: cups-devel
@ -86,6 +87,7 @@ based on libfreerdp.
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
# use a versioned subdirectory for plugins in order to comply with the shared
# library policy
ed -s CMakeLists.txt 2>/dev/null <<'EOF'