Changeset 6029:c25f9d9f78a6 in roaraudio for libroar/serverinfo.c

Timestamp:

07/15/14 11:07:45 (10 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

some smaller improvements in error handling

File:

• libroar/serverinfo.c (modified) (7 diffs)

libroar/serverinfo.c

@@ -174 +174 @@
  char * mesdata;
 
- if ( mes == NULL || info == NULL )
+ if ( mes == NULL || info == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
   return -1;
+ }
 
  _add(ROAR_ITST_VERSION, version);
@@ -193 +195 @@
 
  if ( needlen > LIBROAR_BUFFER_MSGDATA ) {
-  if ( data == NULL )
+  if ( data == NULL ) {
+   roar_err_set(ROAR_ERROR_MSGSIZE);
    return -1;
+  }
 
   mesdata = roar_mm_malloc(needlen);
@@ -250 +254 @@
  ROAR_DBG("roar_server_info(mes=%p{.datalen=%llu) = ?", mes, (long long unsigned int)mes->datalen);
 
- if ( mes == NULL )
-  return NULL;
+ if ( mes == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return NULL;
+ }
 
  if ( data == NULL ) {
@@ -264 +270 @@
 
  // some basic texts like version:
- if ( mes->datalen < needlen )
-  return NULL;
-
- ROAR_DBG("roar_server_info(mes=%p) = ?", mes);
-
- if ( mesdata[0] != 0 ) /* version */
-  return NULL;
-
- ROAR_DBG("roar_server_info(mes=%p) = ?", mes);
-
- if ( mesdata[1] != 0 ) /* reserved */
-  return NULL;
+ if ( mes->datalen < needlen ) {
+  roar_err_set(ROAR_ERROR_PROTO);
+  return NULL;
+ }
+
+ ROAR_DBG("roar_server_info(mes=%p) = ?", mes);
+
+ if ( mesdata[0] != 0 ) { /* version */
+  roar_err_set(ROAR_ERROR_NSVERSION);
+  return NULL;
+ }
+
+ ROAR_DBG("roar_server_info(mes=%p) = ?", mes);
+
+ if ( mesdata[1] != 0 ) { /* reserved */
+  roar_err_set(ROAR_ERROR_PROTO);
+  return NULL;
+ }
 
  ROAR_DBG("roar_server_info(mes=%p) = ?", mes);
@@ -286 +298 @@
 
  // return error if our index buffer is too short.
- if ( idx > (sizeof(iebuf)/sizeof(*iebuf)) )
-  return NULL;
+ if ( idx > (sizeof(iebuf)/sizeof(*iebuf)) ) {
+  roar_err_set(ROAR_ERROR_MSGSIZE);
+  return NULL;
+ }
 
  ROAR_DBG("roar_server_info(mes=%p) = ?", mes);
@@ -296 +310 @@
 
  // recheck if we have a complet index.
- if ( mes->datalen < needlen )
-  return NULL;
+ if ( mes->datalen < needlen ) {
+  roar_err_set(ROAR_ERROR_PROTO);
+  return NULL;
+ }
 
  ROAR_DBG("roar_server_info(mes=%p) = ?", mes);
@@ -321 +337 @@
 
  // recheck if we have all the data...
- if ( mes->datalen < needlen )
-  return NULL;
+ if ( mes->datalen < needlen ) {
+  roar_err_set(ROAR_ERROR_PROTO);
+  return NULL;
+ }
 
  ROAR_DBG("roar_server_info(mes=%p) = ?", mes);