diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-10-05 12:26:40 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-10-05 12:26:40 +0000 |
commit | f11082f73037b6f6de77d7ae7ceddeb803414c7a (patch) | |
tree | dfc33e4641aaa9f85179c8c542265ce28af49e04 /src/conversation/gnunet-service-conversation.c | |
parent | 72ed3e60e4247581c943f4fa124e193bde4557b7 (diff) | |
download | gnunet-f11082f73037b6f6de77d7ae7ceddeb803414c7a.tar.gz gnunet-f11082f73037b6f6de77d7ae7ceddeb803414c7a.zip |
-fix use-after-free in error handling
Diffstat (limited to 'src/conversation/gnunet-service-conversation.c')
-rw-r--r-- | src/conversation/gnunet-service-conversation.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c index 59e5737b7..1bf632854 100644 --- a/src/conversation/gnunet-service-conversation.c +++ b/src/conversation/gnunet-service-conversation.c | |||
@@ -1046,7 +1046,8 @@ handle_cadet_hangup_message (void *cls, | |||
1046 | * @param channel_ctx the channel context, can be NULL | 1046 | * @param channel_ctx the channel context, can be NULL |
1047 | * or point to the `struct Channel` | 1047 | * or point to the `struct Channel` |
1048 | * @param message the incoming message | 1048 | * @param message the incoming message |
1049 | * @return #GNUNET_OK | 1049 | * @return #GNUNET_OK if message was OK, |
1050 | * #GNUNET_SYSERR if message violated the protocol | ||
1050 | */ | 1051 | */ |
1051 | static int | 1052 | static int |
1052 | handle_cadet_pickup_message (void *cls, | 1053 | handle_cadet_pickup_message (void *cls, |
@@ -1076,7 +1077,7 @@ handle_cadet_pickup_message (void *cls, | |||
1076 | case CS_CALLEE_SHUTDOWN: | 1077 | case CS_CALLEE_SHUTDOWN: |
1077 | GNUNET_break_op (0); | 1078 | GNUNET_break_op (0); |
1078 | destroy_line_cadet_channels (ch); | 1079 | destroy_line_cadet_channels (ch); |
1079 | break; | 1080 | return GNUNET_SYSERR; |
1080 | case CS_CALLER_CALLING: | 1081 | case CS_CALLER_CALLING: |
1081 | ch->status = CS_CALLER_CONNECTED; | 1082 | ch->status = CS_CALLER_CONNECTED; |
1082 | break; | 1083 | break; |