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
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