From c145cb89f406d4c481bedf459976fa93f09d9e84 Mon Sep 17 00:00:00 2001
From: Gilbert Wong <gilbertwong96@icloud.com>
Date: Thu, 6 Sep 2018 15:45:18 +0800
Subject: [PATCH] add validate_properties for PUBLISH and fix error for SUB

---
 src/emqx_packet.erl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/emqx_packet.erl b/src/emqx_packet.erl
index c3eab87e1..fc90cf492 100644
--- a/src/emqx_packet.erl
+++ b/src/emqx_packet.erl
@@ -69,12 +69,14 @@ validate_packet_id(0) ->
 validate_packet_id(_) ->
     true.
 
-validate_properties(?SUBSCRIBE, #{'Subscription-Identifier' := _I}) ->
-    %% when I =< 0; I >= 16#FFFFFFF ->
-    error(protocol_error);
-validate_properties(?PUBLISH, # {'Topic-Alias':= I})
+validate_properties(?SUBSCRIBE, #{'Subscription-Identifier' := I})
+    when I =< 0; I >= 16#FFFFFFF ->
+    error(subscription_identifier_invalid);
+validate_properties(?PUBLISH, #{'Topic-Alias':= I})
     when I =:= 0 ->
     error(topic_alias_invalid);
+validate_properties(?PUBLISH, #{'Subscription-Identifier' := _I}) ->
+    error(protocol_error);
 validate_properties(_, _) ->
     true.