[Telepathy-commits] [telepathy-gabble/master] Remove half-finished check which caused use of uninitialized memory.

[Simon McVittie]

The intention was to check for TargetHandle != 0 whenever
TargetHandleType != NONE. However, this isn't useful to do until
TargetID is supported (since it's a possible replacement for
TargetHandle), and the implementation wasn't finished anyway. Great
embarrasment all round.
---
 src/conn-requests.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/conn-requests.c b/src/conn-requests.c
index 07fccdd..2c38c4b 100644
--- a/src/conn-requests.c
+++ b/src/conn-requests.c
@@ -970,6 +970,7 @@ conn_requests_requestotron (GabbleConnection *self,
       goto out;
     }
 
+  /* Handle type 0 cannot have a handle */
   if (target_handle_type == TP_HANDLE_TYPE_NONE && target_handle != 0)
     {
       GError e = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
@@ -995,9 +996,6 @@ conn_requests_requestotron (GabbleConnection *self,
    * requested_properties = altered_properties (shadowing the original).
    * If handle normalization fails, raise an error */
 
-  /* Nonzero target handle types must have nonzero handles */
-  if (target_handle_type != TP_HANDLE_TYPE_NONE && target_handle == 0)
-
   switch (method)
     {
     case METHOD_CREATE_CHANNEL:
-- 
1.5.6.3