Martin Haimberger
6ab0187d84
Merge remote-tracking branch 'upstream/master' into mh-channel
...
Conflicts:
channels/audin/client/oss/audin_oss.c
channels/drive/client/drive_main.c
channels/printer/client/printer_cups.c
channels/printer/client/printer_main.c
channels/rail/client/rail_main.c
channels/rdpgfx/client/rdpgfx_main.c
channels/rdpsnd/client/oss/rdpsnd_oss.c
channels/remdesk/client/remdesk_main.c
channels/remdesk/server/remdesk_main.c
channels/tsmf/client/tsmf_media.c
2015-07-15 01:57:07 -07:00
Martin Haimberger
b8c110d19b
introduced channel error reporting system
...
The rdpContext gets an event which will
get set if an error occoured in a channel.
If a thread or a void callback has to report an
error it will get signaled by this system.
2015-07-15 00:50:35 -07:00
MartinHaimberger
b06d83ba80
Merge pull request #2766 from akallabeth/snprintf_to_sprintf_s
...
Replaced snprintf with sprintf_s
2015-07-15 09:47:43 +02:00
Bernhard Miklautz
68e8569110
winpr/synch: remove the dependency on winsock.h
...
winsock.h pulls in a lot of defines and dependencies that are not
required and partially unwanted in winpr's core (for parts that are not
related to network). In order to get rid of this dependency and have an
independent defines for extended winpr functions the WINPR_FD_* defines
are used internally (and for exposed functions). Where required, like in
WSAEventSelect, the FD_* is mapped to WINPR_FD_*.
2015-07-14 11:39:41 +02:00
Martin Haimberger
d9e2834a70
channel smartcard hardend
2015-07-09 03:00:19 -07:00
Marc-André Moreau
aae86d61ce
channels/rdpgfx: fix TotalDecodedFrames counter
2015-07-08 14:16:29 -04:00
Marc-André Moreau
23f9b3bbc0
channels/rdpgfx: reset state on channel close
2015-07-08 11:17:56 -04:00
Marc-André Moreau
11f785290f
channels/drdynvc: use same status code as mstsc for DVC opening failure
2015-07-07 13:36:36 -04:00
Marc-André Moreau
3781e803ed
channels/rdpgfx: improve frame ack handling
2015-07-06 16:28:52 -04:00
David FORT
b83ab92776
Hardened urbdrc channel
2015-07-06 16:46:21 +02:00
David FORT
1b7140d84e
Fixed some more checks in rdpsnd channel
2015-07-04 00:17:37 +02:00
Armin Novak
cf9f975341
Replaced snprintf with sprintf_s
2015-07-03 13:26:15 +02:00
Armin Novak
d18b0fbeb4
Handle API updated.
2015-07-03 09:52:52 +02:00
David FORT
ea679b2d8b
Hardened TSMF channel
...
This patch adds some checks for the TSMF channel:
* checks malloc / calloc / strdup / _strdup return value
* checks for available bytew before reading in a stream
2015-07-02 14:32:05 +02:00
Zavadovsky Yan
2c1aff1ab9
channels/rdpsnd: fix memory leak
...
Pointer to sound data chunk must be put into queue
otherwise bqPlayerCallback() will have nothing to free and
memory will leak.
2015-07-01 18:58:38 +03:00
Zavadovsky Yan
6ce87bd477
channels/rdpsnd: fix rdpsnd_opensles_set_format() logic
...
If server says "PCM format" treat sound data as PCM, not ADPCM.
This fixes noise from speakers when using Xrdp as server.
2015-07-01 18:58:10 +03:00
Norbert Federa
1c43a6e115
Merge pull request #2738 from bmiklautz/ffuncs
...
hardening: check fread and fwrite return values
2015-07-01 13:02:32 +02:00
Marc-André Moreau
ff5b876260
channels/drdynvc: silence harmless warnings with Windows 8 / Windows 2012 channel close
2015-06-29 14:47:46 -04:00
Bernhard Miklautz
1cee185e3c
hardening: check fread and fwrite return values
2015-06-26 20:38:30 +02:00
Marc-André Moreau
5ec19d2045
Merge branch 'master' of github.com:FreeRDP/FreeRDP
2015-06-26 14:00:03 -04:00
Marc-André Moreau
24ed6b06cc
channels/rdpgfx: update debug output
2015-06-26 13:59:41 -04:00
Norbert Federa
ac95b7274e
Merge pull request #2727 from akallabeth/leak_fixes_reformat
...
Fixed leaks, NULL dereferences and broken init.
2015-06-26 15:01:08 +02:00
Marc-André Moreau
ddf2519f1e
Merge pull request #2719 from bmiklautz/pull/2481
...
OSS, tsmf, usb and BSD fixes and improvements
2015-06-26 08:27:22 -04:00
Armin Novak
015754633d
Fixed out of bound array access.
2015-06-26 09:50:21 +02:00
David FORT
a8fefae3a1
Harden the sound channel
...
This patch adds checks for the sound channel and plugins:
* checks for protocol bytes;
* checks for malloc/calloc;
* be more strict when interacting with sound plugin
2015-06-24 17:06:45 +02:00
Armin Novak
6698e24228
Fixed leaks, NULL dereferences and broken init.
2015-06-23 21:29:21 +02:00
Bernhard Miklautz
72fde88a8f
tsmf_oss: fix compiler warning
2015-06-23 11:40:04 +02:00
Bernhard Miklautz
7624519453
oss: fix formating
2015-06-22 19:45:56 +02:00
David FORT
7c3f8f33ab
Fixes for malloc / calloc + other fixes
...
This patch contains:
* checks for malloc return value + treat callers;
* modified malloc() + ZeroMemory() to calloc();
* misc fixes of micro errors seen during the code audit:
** some invalid checks in gcc.c, also there were some possible
integer overflow. This is interesting because at the end the data are parsed
and freed directly, so it's a vulnerability in some kind of dead code (at least
useless);
** fixed usage of GetComputerNameExA with just one call, when 2 were used
in misc places. According to MSDN GetComputerNameA() is supposed to return
an error when called with NULL;
** there were a bug in the command line parsing of shadow;
** in freerdp_dynamic_channel_collection_add() the size of array was multiplied
by 4 instead of 2 on resize
2015-06-22 19:21:47 +02:00
Bernhard Miklautz
77927c213e
android: fix misc compiler warnings
...
with gcc version arm-linux-androideabi-gcc (GCC) 4.8
2015-06-22 19:09:59 +02:00
Marc-André Moreau
093aaa4dc0
Merge pull request #2636 from xhaakon/master
...
Fix crashes in shadow server
2015-06-22 09:15:37 -04:00
Martin Haimberger
0c3a62be7a
hardend remdesk channel
2015-06-22 00:12:25 -07:00
Martin Haimberger
6e4e1c2773
Merge remote-tracking branch 'upstream/master' into mh-stream-fix
...
Conflicts:
client/Windows/wf_cliprdr.c
2015-06-18 03:06:40 -07:00
Martin Haimberger
76305a716c
just satisfied compiler
2015-06-18 03:04:33 -07:00
Martin Haimberger
62d7b1e4df
hardend serial channel
2015-06-18 03:04:33 -07:00
Martin Haimberger
dc68bdfce5
channel rdpgfx hardend
2015-06-18 03:04:32 -07:00
Martin Haimberger
6348e41479
channel rdpei hardend
2015-06-18 03:04:32 -07:00
Martin Haimberger
d7636d0e28
channel rail hardend
2015-06-18 03:04:32 -07:00
Martin Haimberger
0965608e80
channel printer hardend
2015-06-18 03:04:32 -07:00
Martin Haimberger
3cc0148577
channel parallel hardend
2015-06-18 03:04:32 -07:00
Martin Haimberger
b9853f87eb
channel encomsp hardend
2015-06-18 03:04:32 -07:00
Martin Haimberger
0cfbc6648b
channel echo hardend
2015-06-18 03:04:32 -07:00
Martin Haimberger
2b3b999929
changed returnvalues of DeviceServiceEntry to WIN32ERROR
2015-06-18 03:04:32 -07:00
Martin Haimberger
d3d60520e5
hardend channel drive
2015-06-18 03:04:32 -07:00
Martin Haimberger
0bf222ec50
hardend rdpdr channel
2015-06-18 03:04:32 -07:00
Martin Haimberger
dca53c132c
hardend display channel
2015-06-18 03:04:32 -07:00
Martin Haimberger
e5d5cd3c94
hardend cliprdr
...
hardend cliprdr server and client
also updated all callbacks in the server and client
implementations
2015-06-18 03:04:31 -07:00
Martin Haimberger
d33e8a15b5
hardend client addin
2015-06-18 03:04:31 -07:00
Martin Haimberger
156f86e487
hardend channel audin
2015-06-18 03:04:31 -07:00
Martin Haimberger
d06da4f1bd
hardend drdynvc channel
2015-06-18 03:04:28 -07:00