Pārlūkot izejas kodu

Updating code to PuTTY 0.74

(cherry picked from commit b2d1f2f8554cbcbe91420e61d5a7bcb4a0da3018)

Source commit: 61f1cb1a6808d71e43c0d85395d5827d13b488b5
Martin Prikryl 5 gadi atpakaļ
vecāks
revīzija
7e7cff6ac8
2 mainītis faili ar 4 papildinājumiem un 4 dzēšanām
  1. 1 1
      source/core/PuttyIntf.cpp
  2. 3 3
      source/putty/sshcommon.c

+ 1 - 1
source/core/PuttyIntf.cpp

@@ -203,7 +203,7 @@ static int get_userpass_input(Seat * seat, prompts_t * p, bufchain * DebugUsedAr
       Prompts->AddObject(S, (TObject *)(FLAGMASK(Prompt->echo, pupEcho)));
       // this fails, when new passwords do not match on change password prompt,
       // and putty retries the prompt
-      DebugAssert(Prompt->resultsize == 0);
+      DebugAssert(strlen(prompt_get_result_ref(Prompt)) == 0);
       Results->Add(L"");
     }
 

+ 3 - 3
source/putty/sshcommon.c

@@ -110,8 +110,8 @@ static PktIn *pq_in_after(PacketQueueBase *pqb,
         if (set->ic_pktin_free == NULL)
         {
             set->pktin_freeq_head = snew(PacketQueueNode);
-            set->pktin_freeq_head->next = &set->pktin_freeq_head;
-            set->pktin_freeq_head->prev = &set->pktin_freeq_head;
+            set->pktin_freeq_head->next = set->pktin_freeq_head;
+            set->pktin_freeq_head->prev = set->pktin_freeq_head;
             set->pktin_freeq_head->on_free_queue = TRUE;
 
             set->ic_pktin_free = snew(IdempotentCallback);
@@ -130,7 +130,7 @@ static PktIn *pq_in_after(PacketQueueBase *pqb,
         node->prev->next = node;
         node->on_free_queue = true;
 
-        queue_idempotent_callback(&set->ic_pktin_free); // WINSCP
+        queue_idempotent_callback(set->ic_pktin_free); // WINSCP
     }
 
     return container_of(node, PktIn, qnode);