cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a possible segfault due to dereference of a NULL pointer

Browse Source
This commit is contained in:
edd 2011-09-06 21:33:39 +00:00
parent a03b19cfef
commit 1d54058911
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
audio/hgd/Makefile
View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2011/07/25 23:07:49 edd Exp $
# $OpenBSD: Makefile,v 1.6 2011/09/06 21:33:39 edd Exp $
COMMENT = music system for hackathons
DISTNAME = hgd-0.4.1
REVISION = 0
CATEGORIES = audio net
HOMEPAGE = https://github.com/vext01/hgd/

34
audio/hgd/patches/patch-hgd-netd_c Normal file
View File

@ -0,0 +1,34 @@
$OpenBSD: patch-hgd-netd_c,v 1.1 2011/09/06 21:33:40 edd Exp $
Fix for #77, seg fault when a client attempts to queue without being logged in.
--- hgd-netd.c.orig Sun Jul 24 18:29:43 2011
+++ hgd-netd.c Sat Aug 27 22:51:01 2011
@@ -303,6 +303,13 @@ hgd_cmd_queue(struct hgd_session *sess, char **args)
ssize_t write_ret;
char *filename, *tag_artist, *tag_title;
+ if (sess->user == NULL) {
+ hgd_sock_send_line(sess->sock_fd, sess->ssl,
+ "err|user_not_identified");
+ ret = HGD_FAIL;
+ goto clean;
+ }
+
if ((flood_limit >= 0) &&
(hgd_num_tracks_user(sess->user->name) >= flood_limit)) {
@@ -320,13 +327,6 @@ hgd_cmd_queue(struct hgd_session *sess, char **args)
if ((bytes == 0) || ((long int) bytes > max_upload_size)) {
DPRINTF(HGD_D_WARN, "Incorrect file size");
hgd_sock_send_line(sess->sock_fd, sess->ssl, "err|size");
- ret = HGD_FAIL;
- goto clean;
- }
-
- if (sess->user == NULL) {
- hgd_sock_send_line(sess->sock_fd, sess->ssl,
- "err|user_not_identified");
ret = HGD_FAIL;
goto clean;
}