opj_mj2_extract: Avoid segfault for long filenames

[openjpeg.git] / src / lib / openmj2 / event.c

diff --git a/src/lib/openmj2/event.c b/src/lib/openmj2/event.c
index 0210ed684ec22fd8535da2540542ddb2249e1989..7eebfaa45dfc4f085df52d6b0ab1e73476ab650b 100644 (file)
--- a/src/lib/openmj2/event.c
+++ b/src/lib/openmj2/event.c
@@ -1,6 +1,6 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
+ * The copyright in this software is being made available under the 2-clauses
+ * BSD License, included below. This software may be subject to other third
  * party and contributor rights, including patent rights, and no such rights
  * are granted under this license.
  *
@@ -38,14 +38,17 @@
 #ifdef OPJ_CODE_NOT_USED
 #ifndef _WIN32
 static char*
-i2a(unsigned i, char *a, unsigned r) {
-       if (i/r > 0) a = i2a(i/r,a,r);
-       *a = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"[i%r];
-       return a+1;
+i2a(unsigned i, char *a, unsigned r)
+{
+    if (i / r > 0) {
+        a = i2a(i / r, a, r);
+    }
+    *a = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"[i % r];
+    return a + 1;
 }
 
-/** 
- Transforms integer i into an ascii string and stores the result in a; 
+/**
+ Transforms integer i into an ascii string and stores the result in a;
  string is encoded in the base indicated by r.
  @param i Number to be converted
  @param a String result
@@ -53,74 +56,82 @@ i2a(unsigned i, char *a, unsigned r) {
  @return Returns a
 */
 static char *
-_itoa(int i, char *a, int r) {
-       r = ((r < 2) || (r > 36)) ? 10 : r;
-       if(i < 0) {
-               *a = '-';
-               *i2a(-i, a+1, r) = 0;
-       }
-       else *i2a(i, a, r) = 0;
-       return a;
+_itoa(int i, char *a, int r)
+{
+    r = ((r < 2) || (r > 36)) ? 10 : r;
+    if (i < 0) {
+        *a = '-';
+        *i2a(-i, a + 1, r) = 0;
+    } else {
+        *i2a(i, a, r) = 0;
+    }
+    return a;
 }
 
 #endif /* !_WIN32 */
 #endif
 /* ----------------------------------------------------------------------- */
 
-opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context) {
-       if(cinfo) {
-               opj_event_mgr_t *previous = cinfo->event_mgr;
-               cinfo->event_mgr = event_mgr;
-               cinfo->client_data = context;
-               return previous;
-       }
+opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo,
+        opj_event_mgr_t *event_mgr, void *context)
+{
+    if (cinfo) {
+        opj_event_mgr_t *previous = cinfo->event_mgr;
+        cinfo->event_mgr = event_mgr;
+        cinfo->client_data = context;
+        return previous;
+    }
 
-       return NULL;
+    return NULL;
 }
 
-opj_bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, ...) {
+opj_bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt,
+                       ...)
+{
 #define MSG_SIZE 512 /* 512 bytes should be more than enough for a short message */
-       opj_msg_callback msg_handler = NULL;
+    opj_msg_callback msg_handler = NULL;
 
-       opj_event_mgr_t *event_mgr = cinfo->event_mgr;
-       if(event_mgr != NULL) {
-               switch(event_type) {
-                       case EVT_ERROR:
-                               msg_handler = event_mgr->error_handler;
-                               break;
-                       case EVT_WARNING:
-                               msg_handler = event_mgr->warning_handler;
-                               break;
-                       case EVT_INFO:
-                               msg_handler = event_mgr->info_handler;
-                               break;
-                       default:
-                               break;
-               }
-               if(msg_handler == NULL) {
-                       return OPJ_FALSE;
-               }
-       } else {
-               return OPJ_FALSE;
-       }
+    opj_event_mgr_t *event_mgr = cinfo->event_mgr;
+    if (event_mgr != NULL) {
+        switch (event_type) {
+        case EVT_ERROR:
+            msg_handler = event_mgr->error_handler;
+            break;
+        case EVT_WARNING:
+            msg_handler = event_mgr->warning_handler;
+            break;
+        case EVT_INFO:
+            msg_handler = event_mgr->info_handler;
+            break;
+        default:
+            break;
+        }
+        if (msg_handler == NULL) {
+            return OPJ_FALSE;
+        }
+    } else {
+        return OPJ_FALSE;
+    }
 
-       if ((fmt != NULL) && (event_mgr != NULL)) {
-               va_list arg;
-               int str_length/*, i, j*/; /* UniPG */
-               char message[MSG_SIZE];
-               /* initialize the optional parameter list */
-               va_start(arg, fmt);
-               /* parse the format string and put the result in 'message' */
-               str_length = vsnprintf(message, MSG_SIZE, fmt, arg); /* UniPG */
-               /* deinitialize the optional parameter list */
-               va_end(arg);
+    if ((fmt != NULL) && (event_mgr != NULL)) {
+        va_list arg;
+        int str_length/*, i, j*/; /* UniPG */
+        char message[MSG_SIZE];
+        /* initialize the optional parameter list */
+        va_start(arg, fmt);
+        /* parse the format string and put the result in 'message' */
+        str_length = vsnprintf(message, MSG_SIZE, fmt, arg); /* UniPG */
+        /* deinitialize the optional parameter list */
+        va_end(arg);
 
-               /* output the message to the user program */
-    if( str_length > -1 && str_length < MSG_SIZE )
-      msg_handler(message, cinfo->client_data);
-    else return OPJ_FALSE;
-       }
+        /* output the message to the user program */
+        if (str_length > -1 && str_length < MSG_SIZE) {
+            msg_handler(message, cinfo->client_data);
+        } else {
+            return OPJ_FALSE;
+        }
+    }
 
-       return OPJ_TRUE;
+    return OPJ_TRUE;
 }