Changeset 5145:c1a3ca765154 in roaraudio for libroar/client.c

Timestamp:

10/11/11 13:47:59 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

• Fixed invalid pointer aliasing in filter code (pr0)
• Fixed remote a local buffer overflow in client to message converter code as well as a remote attackable overflow in message to client converter code (pr0)
• Updated error handling (pr0)

File:

• libroar/client.c (modified) (6 diffs)

libroar/client.c

@@ -39 +39 @@
  int i;
 
- if ( client == NULL )
+ if ( client == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
   return -1;
+ }
 
  memset(client, 0, sizeof(struct roar_client));
@@ -58 +60 @@
 
 int roar_client_set_fh   (struct roar_client * client, int fh) {
- if ( client == NULL )
+ if ( client == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
   return -1;
+ }
 
  client->fh = fh;
@@ -67 +71 @@
 
 int roar_client_set_proto(struct roar_client * client, int proto, int byteorder) {
- if ( client == NULL )
+ if ( client == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
   return -1;
+ }
 
  client->proto = proto;
@@ -80 +86 @@
     break;
    default:
+     roar_err_set(ROAR_ERROR_INVAL);
      return -1;
     break;
@@ -93 +100 @@
  int confh;
  int i;
+
+ if ( con == NULL || client == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
 
  memset(&m,  0, sizeof(m));
@@ -133 +145 @@
  int i;
 
+ if ( con == NULL || client == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
  memset(&m,  0, sizeof(m));