Commit Graph

1352 Commits

Author SHA1 Message Date
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
ivan-83
e22a4461c7 rdpsnd oss remove unneded mem operations 2015-05-30 03:02:25 +03:00
ivan-83
d925f2f9fe rdpsnd: latency process 2015-05-30 02:22:18 +03:00
David FORT
12f873f1f9 Fixed MessageQueue and callers 2015-05-29 14:24:14 +02:00
Norbert Federa
8e70012d65 tsmf: fix invalid check and a potential segfault
This resuscitates tsmf which was accidently broken in commit f8120919
2015-05-28 10:49:38 +02:00
ivan-83
9313197023 Code style changed. 2015-05-28 00:00:25 +03:00
ivan-83
307d22ca11 * debug and error messages now print function name and line number
* add debug messages to trace fake network dissconects
2015-05-27 23:48:07 +03:00
ivan-83
20a1d2b097 * tsmf: OSS now work, but only with ffmpeg, and sound is bad (like with alsa), ffmpeg code possible have bug with wrong resample 2015-05-27 23:23:57 +03:00
ivan-83
3912172fc8 + tsmf: OSS initial suppot (not work yet)
* tsmf: fix video playback on FreeBSD (proper shared object name)
* tsmf: renamed args: audio->sys, audio-dev->dev
* audin: OSS fix, now it work
* cmdline: add syntax help for /audin, /rdpsnd, /tsmf
* add debug messages
2015-05-27 23:22:36 +03:00
ivan-83
0fda0eb0de Code style changed. 2015-05-27 22:59:57 +03:00
ivan-83
83a40a32a7 * tsmf: OSS code cleanup
+ urbdrc: add devd support (not tested)
* fix FindUUID detection ubder BSD
* wlog: fix prev commit: build error on Windows
* cmdline: add /usb syntax help
2015-05-27 22:58:41 +03:00
ivan-83
1009268158 * debug and error messages now print function name and line number
* add debug messages to trace fake network dissconects
2015-05-27 22:57:10 +03:00
ivan-83
4f15e59900 * tsmf: OSS now work, but only with ffmpeg, and sound is bad (like with alsa), ffmpeg code possible have bug with wrong resample 2015-05-27 22:54:13 +03:00
ivan-83
94a7abd2af + tsmf: OSS initial suppot (not work yet)
* tsmf: fix video playback on FreeBSD (proper shared object name)
* tsmf: renamed args: audio->sys, audio-dev->dev
* audin: OSS fix, now it work
* cmdline: add syntax help for /audin, /rdpsnd, /tsmf
* add debug messages
2015-05-27 22:54:13 +03:00
Marc-André Moreau
35e26020aa freerdp: patch multiple leaks and OOM errors 2015-05-22 14:14:57 -04:00
Marc-André Moreau
89642923d1 channels/rdpdr: add more server-side error checking 2015-05-21 16:50:29 -04:00
Marc-André Moreau
d8460d14e0 channels/rdpdr: treat OOM and status failures in server-side code 2015-05-21 16:08:46 -04:00
Marc-André Moreau
aa34c8a7d5 channels/rdpdr: cleanup server-side rdpdr code 2015-05-21 14:33:38 -04:00
Marc-André Moreau
5526348079 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2015-05-21 13:29:59 -04:00
Marc-André Moreau
b9c1cddc2e Merge pull request #2583 from bceverly/OpenBSD-cleanup
Two minor source code changes to remove warnings
2015-05-21 10:17:54 -04:00
David FORT
29d372480a Take in account nfedera's review 2015-05-20 19:19:50 +02:00
Marc-André Moreau
7e1dbd505b Merge branch 'awakecoding' of https://github.com/vworkspace/FreeRDP
Conflicts:
	channels/rdpdr/server/rdpdr_main.c
2015-05-20 11:40:48 -04:00
Jakub Adam
2e4948c38c Make remdesk_virtual_channel_write() static
The function with the same name is defined in multiple libraries
(libfreerdp-shadow.so, libfreerdp-server.so), which might confuse
the dynamic linker at runtime, binding a wrong version of the function
and thus causing segmentation faults.

Since remdesk_virtual_channel_write()s aren't used outside the files
they are defined in, we can declare them static to make them invisible
to the linker.
2015-05-20 08:10:41 +02:00
David FORT
f8d6eb226c Fixed last VirtualChannelEntry 2015-05-19 13:56:48 +02:00
David FORT
6fb3f390a0 Fixed functions that return BOOLs 2015-05-19 13:48:57 +02:00
Bernhard Miklautz
d922afc24a smartcard: fix compiler warnings
gcc 4.7.2:
warning: passing argument 1 of ‘free’ discards ‘const’ qualifier from
pointer target type
2015-05-18 11:36:31 +02:00
Hardening
f8120919af Add checks for some XXX_New and XXX_Add functions
Based on PR #2616
2015-05-18 11:28:00 +02:00
Norbert Federa
1eff1a345e free can handle NULL perfectly fine 2015-05-11 09:07:39 +02:00
Bryan Everly
9865854f3c Simplified random byte stream generation code to use SSL RAND_bytes() and also eliminated two more compiler warnings. 2015-05-05 12:33:44 -04:00
Norbert Federa
25fc866a58 Fix unchecked CreateThread calls and misc fixes 2015-05-05 13:55:48 +02:00
Mike McDonald
b6cb94b60e Fixed protocol parsing issue in general capability set. The SpecialTypeDeviceCap field is only present when the Version field is set to GENERAL_CAPABILITY_VERSION_02. 2015-04-22 17:33:42 -04:00
Bryan Everly
a2a1d06d9b Necessary changes to get latest branch working on OpenBSD 5.6 2015-04-21 14:44:02 -04:00
Bryan Everly
8c75127a67 Necessary changes to get latest branch working on OpenBSD 5.6 2015-04-21 14:42:06 -04:00
Armin Novak
449929fc35 Fixed NULL dereference. 2015-04-15 10:37:28 +02:00
Maxim
9b8754ca72 Update urbdrc_main.c 2015-04-12 14:51:27 +03:00
Maxim
d4ad03bbf0 fixed buffer overflow at sprintf 2015-04-10 15:44:27 +03:00
Maxim
0b39a1f72a fixed undefined behaviour of sprintf, buffer overflow 2015-04-08 18:21:52 +03:00
David FORT
cf8c7631bd Kill more exit() occurences
In general we should not have any exit() call in libfreerdp.
2015-03-31 23:56:40 +02:00
Armin Novak
e68726400d Fixed NULL pointer dereference. 2015-03-31 15:18:45 +02:00
Bernhard Miklautz
79de8168f9 Integrate feedback from pull request
* orders.c: remove ; at eol
* rdpdr_main.c: simplify error case
* rdpsnd_pulse.c: fix incorrect check
* rdpsnd_main.c: adapt return value according to documentation
* update.c: fix incorrect return values
2015-03-30 18:29:32 +02:00
Bernhard Miklautz
8615f74eac drdynvc: ensure stream != NULL 2015-03-30 17:23:22 +02:00
Bernhard Miklautz
6a997fad53 cliprdr: ensure stream != NULL 2015-03-30 17:17:36 +02:00
Bernhard Miklautz
74c8400789 coding style fixes
Add missing space after if
2015-03-30 17:15:45 +02:00
Bernhard Miklautz
f469e069dc stream: Stream_Ensure*Capacity: change return type
Change the return type of Stream_Ensure*Capacity from void to BOOL to be
able to detect realloc problems easily. Otherwise the only way to detect
this was to check if the capacity after the call was >= the required
size.
In case Stream_Ensure*Capacity fails the old memory is still available
and need to freed outside.

This commit also adds checks to most calls of Stream_Ensure*Capacity to
check if the call was successful.
2015-03-30 16:33:48 +02:00
Marc-André Moreau
851626f296 Merge pull request #2492 from bmiklautz/malloc_wrap
Fix compiler warnings and code hardening
2015-03-30 09:35:36 -04:00
tagunil
45ea141974 tsmf: free frame data after processing 2015-03-26 13:38:09 +03:00
Bernhard Miklautz
f2b4709cbd opensl: remove unnecessary memset 2015-03-25 17:38:21 +01:00
Bernhard Miklautz
7f3326d41c Fix compiler warnings
gcc 4.7.2
* warning: value computed is not used [-Wunused-value]
* warning: unused variable ‘oss’ [-Wunused-variable]
2015-03-25 17:38:21 +01:00
Bernhard Miklautz
3c7662517c hardening
Start to add missing checks for:
* *alloc
* *_New
2015-03-25 17:38:21 +01:00
Marc-André Moreau
afdd55fa81 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2015-03-13 15:30:31 -04:00
Marc-André Moreau
cb27703d2e Merge pull request #2461 from ivan-83/master
audin OSS support, dyn channels fix, dev arg broken fix, add debug verbosity, build warning fix
2015-03-13 15:19:35 -04:00
Marc-André Moreau
cb002d91cd channels/smartcard: fix pioRecvPci with cbExtraBytes > 0 2015-03-13 14:20:57 -04:00
Zhang Zhaolong
c2ddb08437 urbdrc: fix undefined behavior of sprintf.
Signed-off-by: Zhang Zhaolong <zhangzl2013@126.com>
2015-03-13 11:15:14 +08:00
ivan-83
3a8022e67c * audin OSS files 2015-03-13 01:41:44 +03:00
ivan-83
9e7e4ce7ff Merge branch 'master' of github.com:ivan-83/FreeRDP 2015-03-13 01:39:41 +03:00
ivan-83
7b3a552988 + audin OSS support (un tested now)
+ add: COMMAND_LINE_IGN_UNKNOWN_KEYWORD flag for CommandLineParseArgumentsA to ignory unknown keys without fail
+ add: lot of WLog_DBG() in drdynvc, add function names in existing
* change: error text in rdpsnd OSS
* fix: dev in rdpsnd does not work
* fix/change: audio-dev renamed to dev and now work in audin
* fix dynamic channels now work again
2015-03-13 01:28:44 +03:00
Marc-André Moreau
dfc1238523 Merge pull request #2447 from ivan-83/master
Fix poor sound quality with ALSA, add OSS sound system support, FreeBSD patches
2015-03-12 10:09:02 -04:00
Zhang Zhaolong
e675a41705 rail: fix incorrect usage of realloc.
Signed-off-by: Zhang Zhaolong <zhangzl2013@126.com>
2015-03-11 11:17:52 +08:00
Zhang Zhaolong
d329831ba1 audin: fix incorrect usage of realloc.
Signed-off-by: Zhang Zhaolong <zhangzl2013@126.com>
2015-03-11 11:10:28 +08:00
Zhang Zhaolong
b8de622b90 tsmf: fix incorrect usage of realloc.
Signed-off-by: Zhang Zhaolong <zhangzl2013@126.com>
2015-03-11 11:04:36 +08:00
ivan-83
0f3b639058 * OSS build fix on linux 2015-03-11 02:17:45 +03:00
ivan-83
e85dccc22a * remove OSS debug messages 2015-03-10 01:34:15 +03:00
ivan-83
4f8f84f33b + some files for OSS, missed from prev commit 2015-03-09 09:31:27 +03:00
ivan-83
fe9fab920e + add OSS support for rdpsnd 2015-03-09 09:23:29 +03:00
ivan-83
8d5825ee00 Fix poor sound quality with ALSA
and decrease "ALSA lib pcm.c:7339:(snd_pcm_recover) underrun occurred"
+ little code cleanup
2015-03-09 09:11:46 +03:00
Marc-André Moreau
bc50c81a0a channels/smartcard: fix SCardTransmit return encoding with pioRecvPci 2015-02-20 15:39:51 -05:00
Armin Novak
69afce34c7 Debug messages now use WLog_DBG instead of WLog_ERR. 2015-02-19 08:45:45 +01:00
Marc-André Moreau
22ac46957a xfreerdp: fix egfx multimonitor support 2015-02-10 16:32:07 -05:00
Marc-André Moreau
0054b6b134 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2015-02-06 18:02:10 -05:00
Marc-André Moreau
edb8b3055f Merge pull request #2367 from eledoux/ports
fixed: serial redirect not work #2333
2015-02-06 18:02:16 -05:00
Marc-André Moreau
3258c887a4 libfreerdp-core: add channel reconnect 2015-02-06 17:35:14 -05:00
Marc-André Moreau
fa06c4d401 libfreerdp-core: improve reconnection 2015-02-06 14:21:26 -05:00
Emmanuel Ledoux
cf3d857b89 serial: changed the default underlying ServerSerialDriverId from SerialDriverSerCx2Sys to SerialDriverSerialSys 2015-02-06 19:56:36 +01:00
Marc-André Moreau
82d58086db xfreerdp: partial reconnect fixes 2015-02-05 17:01:56 -05:00
Marc-André Moreau
a4979456e5 Merge branch 'master' of github.com:FreeRDP/FreeRDP into gateway 2015-02-04 11:36:05 -05:00
Petr Sumbera
17df42e4b5 Fixes some build issues on Solaris 11. 2015-02-02 08:48:54 -08:00
Marc-André Moreau
5e53063d55 channels/smartcard: fix SCardTransmit pioRecvPci parsing 2015-01-31 12:27:48 -05:00
Marc-André Moreau
bc857776fb Merge branch 'master' of github.com:FreeRDP/FreeRDP 2015-01-27 15:55:52 -05:00
Marc-André Moreau
c76847dafc Merge branch 'master' of github.com:awakecoding/FreeRDP 2015-01-27 14:54:49 -05:00
Norbert Federa
70c8acdd67 drdynvc: fix segfaults and a compiler warning
If we send a negative creation status while processing the DVC create
response pdu in drdynvc_process_create_request() we must also close
the created channel. Otherwise we will get duplicated channel IDs
in the channel manager's array list because the server will
eventually reuse the channel ids which we have reported as failed in
previous creation responses.
In order to protect the client from duplicated IDs sent by buggy or
malicious servers I've added an appropriate check in
dvcman_channel_new() which will now return NULL in this case.
Also added a missing NULL check for the result of dvcman_channel_new()
in dvcman_create_channel().
2015-01-26 19:26:38 +01:00
Marc-André Moreau
bcc702346f channels/smartcard: fix buffer read alignment in SCardTransmit parsing 2015-01-23 14:19:15 -05:00
Marc-André Moreau
0146927605 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2015-01-22 16:07:25 -05:00
Armin Novak
2f57cca71c Moved arraylist remove to dvcman_close_channel
This ensures, that the resources are also cleaned up if no channel
listener was registered.
2015-01-21 14:16:23 +01:00
Armin Novak
256c64fbed Fixes cleanup when closing a dynamic channel.
The resource cleanup was executed twice for each dynamic channel.
Now cleaning up the resources by array list free callback and only
when closing the channel.
2015-01-21 12:58:18 +01:00
Marc-André Moreau
f0fc27f7bd libwinpr-winscard: add WINPR_WINSCARD_LOCK_TRANSACTIONS environment variable, fix winpr_HexDump line feeds 2015-01-20 15:29:05 -05:00
Marc-André Moreau
ee51da8500 channels/smartcard: cleanup debug output 2015-01-20 11:16:37 -05:00
Marc-André Moreau
b057d1eaf7 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2015-01-20 09:29:21 -05:00
Mike McDonald
b184a7531f Merge branch 'master' of https://github.com/awakecoding/FreeRDP into awakecoding-staging 2015-01-20 08:09:00 -05:00
Armin Novak
b6d0ce797b Fixed variable initialisation and cleanup. 2015-01-20 12:31:43 +01:00
Armin Novak
4d08528f89 Fixed variable initialisation and cleanup. 2015-01-20 12:31:39 +01:00
Armin Novak
97988b4868 Fixed variable initialisation and cleanup. 2015-01-20 12:31:37 +01:00
Armin Novak
cadd2675f6 Fixed variable initialisation and cleanup. 2015-01-20 12:31:30 +01:00
Armin Novak
ac81b9ddf5 Fixed variable initialisation and cleanup. 2015-01-20 12:31:26 +01:00
Armin Novak
557e8bb938 Fixed variable initialisation and cleanup. 2015-01-20 12:31:21 +01:00
Armin Novak
6170aba5fb Fixed variable initialisation and cleanup. 2015-01-20 12:31:16 +01:00
Armin Novak
918ca132f6 Fixed resource cleanup locations.
Additional error checks and logging.
2015-01-20 11:59:13 +01:00
Armin Novak
865bcc5d63 Added CHANNEL_EVENT_DISCONNECTED handling.
Additional error checks and logging.
2015-01-20 11:58:09 +01:00
Armin Novak
9e5ed07556 Added CHANNEL_EVENT_DISCONNECTED handling.
Additional error checks and logging.
2015-01-20 11:58:04 +01:00
Armin Novak
bbacca6db2 Added CHANNEL_EVENT_DISCONNECTED handling.
Additional error checks and logging.
2015-01-20 11:55:50 +01:00
Armin Novak
4171589647 Added CHANNEL_EVENT_DISCONNECTED handling.
Additional error checks and logging.
2015-01-20 11:55:22 +01:00
Armin Novak
cbf8b1cf01 Fixed resource cleanup locations.
Additional error checks and logging.
2015-01-20 11:53:12 +01:00
Armin Novak
56cdb57452 Added CHANNEL_EVENT_DISCONNECTED handling.
Additional error checks and logging.
2015-01-20 11:47:47 +01:00
Armin Novak
de01d7a445 Prettiefied WLog messages. 2015-01-20 11:46:25 +01:00
Armin Novak
3dc1f07847 Added CHANNEL_EVENT_DISCONNECTED handling.
Additional error checks and logging.
2015-01-20 11:45:36 +01:00
Armin Novak
5ce9c71a40 Prettiefied WLog messages. 2015-01-20 11:39:33 +01:00
Armin Novak
54ec26c758 Removed duplicated close call 2015-01-20 11:39:13 +01:00
Armin Novak
ddd8a1da80 Prettiefied WLog messages. 2015-01-20 11:23:12 +01:00
Armin Novak
54fa77a06a Prettiefied WLog messages. 2015-01-20 11:20:38 +01:00
Armin Novak
90b46bf987 Prettiefied WLog messages. 2015-01-20 11:20:09 +01:00
Marc-André Moreau
e47f1c8b80 channels/smartcard: minor robustness fixes 2015-01-19 12:04:23 -05:00
Marc-André Moreau
d5b3f9cbd4 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2015-01-08 14:22:05 -05:00
Mike McDonald
7febeb2dec Added rename file and fixed some minor bugs. 2014-12-30 18:41:21 -05:00
Bernhard Miklautz
b485bb2067 rdpdr: use host name for redirected drives if set
When a client set the host name, redirected drives would still be shown
as coming from the computer name. For example if the computer the client
run on is called "foo" and the client set the /host-name to "bar" any
redirected drive is shown as "driveX on foo".

Now the host name is used for drives when set.
2014-12-30 13:34:11 +01:00
Marc-André Moreau
51554ff16c channels: patch rdpdr/smartcard valgrind leaks, fix hang on disconnect 2014-12-28 14:56:13 -05:00
Marc-André Moreau
5024c42b76 channels/drdynvc: properly handle DYNVC_OPEN/DYNVC_CLOSE requests 2014-12-28 11:13:51 -05:00
Mike McDonald
b21331cf1a First cut at server side implementation of RDPDR drive redirection. 2014-12-27 21:17:34 -05:00
Marc-André Moreau
b552aa9363 libfreerdp-core: add support for multiple redirection target addresses 2014-12-27 18:53:27 -05:00
Marc-André Moreau
27a8e50e60 channels: fix drdynvc, patch memory leaks 2014-12-27 15:20:29 -05:00
Marc-André Moreau
6c2ebb2b58 channels: redirection valgrind fixes 2014-12-27 13:50:50 -05:00
Marc-André Moreau
9ebc67ba02 channels/smartcard: cleanup SCardControl 2014-12-22 16:25:59 -05:00
Marc-André Moreau
0625be2720 channels/smartcard: fix SCardGetAttrib SCARD_AUTOALLOCATE support 2014-12-22 13:28:16 -05:00
Marc-André Moreau
08c8c6f285 channels/cliprdr: fix empty clipboard format lists, server-side locking 2014-12-20 13:07:30 -05:00
Marc-André Moreau
265e8b9e9d cliprdr/server: make channel thread optional 2014-12-18 11:11:36 -05:00