[svn-commits] seanbright: branch group/1.6.1-maintenance r265843 - in /team/group/1.6.1-mai...

[SVN commits to the Digium repositories]

Author: seanbright
Date: Wed May 26 09:43:21 2010
New Revision: 265843

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=265843
Log:
Merged revisions 265273,265316 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r265273 | dvossel | 2010-05-24 12:10:09 -0400 (Mon, 24 May 2010) | 2 lines
  
  fixes segfault when using generic plc
........
  r265316 | tilghman | 2010-05-24 14:19:08 -0400 (Mon, 24 May 2010) | 7 lines
  
  On systems with a LOT of RAM, a signed integer sometimes printed negative.
  
  (closes issue #16837)
   Reported by: jlpedrosa
   Patches: 
         20100504__issue16837.diff.txt uploaded by tilghman (license 14)
........

Modified:
    team/group/1.6.1-maintenance/   (props changed)
    team/group/1.6.1-maintenance/main/asterisk.c
    team/group/1.6.1-maintenance/main/channel.c

Propchange: team/group/1.6.1-maintenance/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: team/group/1.6.1-maintenance/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/group/1.6.1-maintenance/main/asterisk.c?view=diff&rev=265843&r1=265842&r2=265843
==============================================================================
--- team/group/1.6.1-maintenance/main/asterisk.c (original)
+++ team/group/1.6.1-maintenance/main/asterisk.c Wed May 26 09:43:21 2010
@@ -500,13 +500,13 @@
 	}
 	ast_cli(a->fd, "\nSystem Statistics\n");
 	ast_cli(a->fd, "-----------------\n");
-	ast_cli(a->fd, "  System Uptime:             %ld hours\n", sys_info.uptime/3600);
-	ast_cli(a->fd, "  Total RAM:                 %ld KiB\n", (sys_info.totalram * sys_info.mem_unit)/1024);
-	ast_cli(a->fd, "  Free RAM:                  %ld KiB\n", (sys_info.freeram * sys_info.mem_unit)/1024);
-	ast_cli(a->fd, "  Buffer RAM:                %ld KiB\n", (sys_info.bufferram * sys_info.mem_unit)/1024);
-	ast_cli(a->fd, "  Total Swap Space:          %ld KiB\n", (sys_info.totalswap * sys_info.mem_unit)/1024);
-	ast_cli(a->fd, "  Free Swap Space:           %ld KiB\n\n", (sys_info.freeswap * sys_info.mem_unit)/1024);
-	ast_cli(a->fd, "  Number of Processes:       %d \n\n", sys_info.procs);
+	ast_cli(a->fd, "  System Uptime:             %lu hours\n", sys_info.uptime / 3600);
+	ast_cli(a->fd, "  Total RAM:                 %" PRIu64 " KiB\n", ((uint64_t) sys_info.totalram * sys_info.mem_unit) / 1024);
+	ast_cli(a->fd, "  Free RAM:                  %" PRIu64 " KiB\n", ((uint64_t) sys_info.freeram * sys_info.mem_unit) / 1024);
+	ast_cli(a->fd, "  Buffer RAM:                %" PRIu64 " KiB\n", ((uint64_t) sys_info.bufferram * sys_info.mem_unit) / 1024);
+	ast_cli(a->fd, "  Total Swap Space:          %" PRIu64 " KiB\n", ((uint64_t) sys_info.totalswap * sys_info.mem_unit) / 1024);
+	ast_cli(a->fd, "  Free Swap Space:           %" PRIu64 " KiB\n\n", ((uint64_t) sys_info.freeswap * sys_info.mem_unit) / 1024);
+	ast_cli(a->fd, "  Number of Processes:       %d\n\n", sys_info.procs);
 	return CLI_SUCCESS;
 }
 #endif

Modified: team/group/1.6.1-maintenance/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/group/1.6.1-maintenance/main/channel.c?view=diff&rev=265843&r1=265842&r2=265843
==============================================================================
--- team/group/1.6.1-maintenance/main/channel.c (original)
+++ team/group/1.6.1-maintenance/main/channel.c Wed May 26 09:43:21 2010
@@ -3473,6 +3473,12 @@
 	int num_new_samples = frame->samples;
 	struct plc_ds *plc = datastore->data;
 
+
+	/* If this audio frame has no samples to fill in ignore it */
+	if (!num_new_samples) {
+		return;
+	}
+
 	/* First, we need to be sure that our buffer is large enough to accomodate
 	 * the samples we need to fill in. This will likely only occur on the first
 	 * frame we write.