[haiku-commits] r35615 - haiku/trunk/src/add-ons/kernel/network/stack

  • From: axeld@xxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 25 Feb 2010 14:21:40 +0100 (CET)

Author: axeld
Date: 2010-02-25 14:21:40 +0100 (Thu, 25 Feb 2010)
New Revision: 35615
Changeset: http://dev.haiku-os.org/changeset/35615/haiku

Modified:
   haiku/trunk/src/add-ons/kernel/network/stack/net_buffer.cpp
Log:
* Fixed a possible NULL pointer access in case the list is empty.


Modified: haiku/trunk/src/add-ons/kernel/network/stack/net_buffer.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/net_buffer.cpp 2010-02-25 
10:40:58 UTC (rev 35614)
+++ haiku/trunk/src/add-ons/kernel/network/stack/net_buffer.cpp 2010-02-25 
13:21:40 UTC (rev 35615)
@@ -974,11 +974,8 @@
 get_node_at_offset(net_buffer_private* buffer, size_t offset)
 {
        data_node* node = (data_node*)list_get_first_item(&buffer->buffers);
-       while (node->offset + node->used <= offset) {
+       while (node != NULL && node->offset + node->used <= offset)
                node = (data_node*)list_get_next_item(&buffer->buffers, node);
-               if (node == NULL)
-                       return NULL;
-       }
 
        return node;
 }


Other related posts:

  • » [haiku-commits] r35615 - haiku/trunk/src/add-ons/kernel/network/stack - axeld