Marc-André Moreau
90b7d42429
Merge pull request #2838 from akallabeth/smartcard_no_readers
...
Added return value checks for smartcard functions.
2015-08-27 10:05:23 -04:00
Martin Haimberger
52405a3e79
Remove WIN32ERROR type
...
All return values are UINT now.
2015-08-27 05:38:20 -07:00
Martin Haimberger
420a86e1c7
Merge remote-tracking branch 'upstream/master' into mh-channel-fix
...
Conflicts:
channels/drdynvc/client/drdynvc_main.c
channels/rdpgfx/client/rdpgfx_main.c
client/X11/xf_gfx.c
2015-08-25 00:07:04 -07:00
Armin Novak
c40f3198a4
Added return value checks.
2015-08-19 12:50:48 +02:00
Martin Haimberger
414d4b8f8e
fixed wrong returntype under windows
2015-07-30 07:50:10 -07:00
Martin Haimberger
2862109337
Merge remote-tracking branch 'upstream/master' into mh-channel-fix
...
Conflicts:
channels/smartcard/client/smartcard_main.c
channels/smartcard/client/smartcard_operations.c
2015-07-30 07:29:12 -07:00
Martin Haimberger
65fd259610
misc fixes:
...
fixed all bugs from the review
checking all WaitFor*Object/s calls
2015-07-30 06:49:21 -07:00
Bernhard Miklautz
a22dc21c15
remdesk,encomps: misc fixes
...
* only free stream when an error occurs
* ignore unhanded messages instead of throwing an error
* fix memory leak in settings
2015-07-29 17:32:09 +02:00
Marc-André Moreau
5cb06ecc68
Merge branch 'master' of github.com:FreeRDP/FreeRDP
2015-07-28 09:21:33 -04:00
Marc-André Moreau
dfa29804ad
Merge pull request #2799 from kaliway/scardlistreaders-fix
...
Smartcard Reader Connection Handling
2015-07-28 08:51:03 -04:00
Bernhard Miklautz
9fb6705380
rdpdr/printer: ignore unhanded packetID
...
Ignore packetIDs PRN_CACHE_DATA and PRN_USING_XPS instead of returning
an error.
2015-07-28 14:05:57 +02:00
Kirill Kotyagin
ef37487a44
channels/smartcard: fix possible mszReaders leak in smartcard_ListReaders(A/W)_Call
2015-07-22 17:25:17 +03:00
Kirill Kotyagin
76916d614b
channels/smartcard: make smartcard_ListReaders(A/W)_Call return PCSC error statuses to the server
2015-07-22 16:56:24 +03:00
Martin Haimberger
f65d15feeb
fixed audioserver
...
if no data could be read, the ERROR_NO_DATA is returend to
indicate a further read.
2015-07-22 03:16:46 -07:00
Martin Haimberger
58ada13dd9
fixed some remakes and compiler errors
2015-07-22 02:36:24 -07:00
Bernhard Miklautz
f992568432
rdpsnd: restore old behavior and fixes
...
* oss: fix function signature
* autodetection - if only /sound is given all enabled
plugins are tried in order and the first successful loaded is used.
- this restores the previous behavior
* alsa/pulse fix command line parsing - no parameters shouldn't be
treated as error
2015-07-20 12:28:49 +02:00
Rostislav Kondratenko
7248ea98d0
Fixing condition on SCardIsValidContext to be true when context is valid
2015-07-17 18:13:02 +03:00
Rostislav Kondratenko
f2863fabf5
Re-enabled PCSC-Lite transactions and fixed smartcard deinitialization so it will release all contexts to unblock calls waiting for transactions
2015-07-17 16:37:44 +03:00
Martin Haimberger
e682329eeb
fixed compiler errors
2015-07-15 03:17:38 -07:00
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
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