Changeset 5544

Timestamp:

Jan 24, 2017 5:41:05 AM (8 years ago)

Author:

nanang

Message:

Misc (re #1945): Fixed compile warnings on Android 64bit platforms, e.g: dereferencing type-punned pointer, using uninitialized var.

Location:

pjproject/trunk

Files:

• pjlib-util/src/pjlib-util/md5.c (modified) (1 diff)
• pjlib/src/pj/sock_bsd.c (modified) (1 diff)
• pjlib/src/pj/ssl_sock_ossl.c (modified) (1 diff)
• pjmedia/src/pjmedia-audiodev/android_jni_dev.c (modified) (2 diffs)
• pjmedia/src/pjmedia-videodev/android_dev.c (modified) (2 diffs)
• pjmedia/src/pjmedia/avi_player.c (modified) (1 diff)
• pjnath/src/pjnath/stun_msg_dump.c (modified) (3 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/md5.c

@@ -152 +152 @@
 
     /* Append length in bits and transform */
-    ((pj_uint32_t *) ctx->in)[14] = ctx->bits[0];
-    ((pj_uint32_t *) ctx->in)[15] = ctx->bits[1];
+    //((pj_uint32_t *) ctx->in)[14] = ctx->bits[0];
+    //((pj_uint32_t *) ctx->in)[15] = ctx->bits[1];
+    pj_memcpy(&ctx->in[14 << 2], &ctx->bits[0], sizeof(ctx->bits[0]));
+    pj_memcpy(&ctx->in[15 << 2], &ctx->bits[1], sizeof(ctx->bits[1]));
 
     MD5Transform(ctx->buf, (pj_uint32_t *) ctx->in);

pjproject/trunk/pjlib/src/pj/sock_bsd.c

@@ -229 +229 @@
 PJ_DEF(char*) pj_inet_ntoa(pj_in_addr inaddr)
 {
-#if !defined(PJ_LINUX) && !defined(PJ_LINUX_KERNEL)
+#if 0 //!defined(PJ_LINUX) && !defined(PJ_LINUX_KERNEL)
     return inet_ntoa(*(struct in_addr*)&inaddr);
 #else
     struct in_addr addr;
-    addr.s_addr = inaddr.s_addr;
+    //addr.s_addr = inaddr.s_addr;
+    pj_memcpy(&addr, &inaddr, sizeof(addr));
     return inet_ntoa(addr);
 #endif

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -1322 +1322 @@
                     break;
                 case GEN_IPADD:
-                    p = ASN1_STRING_data(name->d.ip);
-                    len = ASN1_STRING_length(name->d.ip);
+                    p = (unsigned char*)M_ASN1_STRING_data(name->d.ip);
+                    len = M_ASN1_STRING_length(name->d.ip);
                     type = PJ_SSL_CERT_NAME_IP;
                     break;

pjproject/trunk/pjmedia/src/pjmedia-audiodev/android_jni_dev.c

@@ -545 +545 @@
     pj_status_t status = PJ_SUCCESS;
     int state = 0;
-    int buffSize, inputBuffSizePlay, inputBuffSizeRec;
+    int buffSize, inputBuffSizePlay = 0, inputBuffSizeRec = 0;
     int channelInCfg, channelOutCfg, sampleFormat;
     jmethodID constructor_method=0, bufsize_method = 0;
@@ -932 +932 @@
         if (stream->track) {
             jmethodID vol_method = 0;
-            int retval;
+            int retval = 0;
             float vol = *(int *)value;
             

pjproject/trunk/pjmedia/src/pjmedia-videodev/android_dev.c

@@ -751 +751 @@
     const pjmedia_video_format_info *vfi;
     pjmedia_video_apply_fmt_param vafp;
-    pj_uint32_t and_fmt;
+    pj_uint32_t and_fmt = 0;
     unsigned convert_to_i420 = 0;
     pj_status_t status = PJ_SUCCESS;
@@ -1108 +1108 @@
                                jlong user_data)
 {
-    and_stream *strm = *(and_stream**)&user_data;
+    and_stream *strm = (and_stream*)(intptr_t)user_data;
     pjmedia_frame f;
     pj_uint8_t *Y, *U, *V;
     pj_status_t status; 
-    void *frame_buf, *data_buf;     
-
+    void *frame_buf, *data_buf;
+    
     strm->frame_ts.u64 += strm->ts_inc;
     if (!strm->vid_cb.capture_cb)

pjproject/trunk/pjmedia/src/pjmedia/avi_player.c

@@ -45 +45 @@
 #define AVI_EOF 0xFFEEFFEE
 
-#define COMPARE_TAG(doc_tag, tag) (doc_tag == *((pj_uint32_t *)avi_tags[tag]))
+//#define COMPARE_TAG(doc_tag, tag) (doc_tag==*((pj_uint32_t*)avi_tags[tag]))
+#define COMPARE_TAG(doc_tag, tag) \
+            (pj_memcmp(&(doc_tag), &avi_tags[tag], 4)==0)
 
 #define SIGNATURE           PJMEDIA_SIG_PORT_VID_AVI_PLAYER

pjproject/trunk/pjnath/src/pjnath/stun_msg_dump.c

@@ -257 +257 @@
     int len;
     unsigned i;
+    pj_uint32_t tsx_id[3];
 
     PJ_ASSERT_RETURN(msg && buffer && length, NULL);
@@ -270 +271 @@
     APPLY();
 
+    pj_memcpy(tsx_id, msg->hdr.tsx_id, sizeof(msg->hdr.tsx_id));
     len = pj_ansi_snprintf(p, end-p, 
                            " Hdr: length=%d, magic=%08x, tsx_id=%08x%08x%08x\n"
@@ -275 +277 @@
                            msg->hdr.length,
                            msg->hdr.magic,
-                           *(pj_uint32_t*)&msg->hdr.tsx_id[0],
-                           *(pj_uint32_t*)&msg->hdr.tsx_id[4],
-                           *(pj_uint32_t*)&msg->hdr.tsx_id[8]);
+                           tsx_id[0],
+                           tsx_id[1],
+                           tsx_id[2]);
     APPLY();