[asterisk-commits] tilghman: trunk r85357 - in /trunk: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Oct 10 23:40:56 2007
New Revision: 85357

URL: http://svn.digium.com/view/asterisk?view=rev&rev=85357
Log:
Merged revisions 85356 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r85356 | tilghman | 2007-10-10 23:35:33 -0500 (Wed, 10 Oct 2007) | 2 lines

A dollar sign by itself, not indicating a start of a variable or expression prematurely ends substitution (closes issue #10939)

........

Modified:
    trunk/   (props changed)
    trunk/main/pbx.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=85357&r1=85356&r2=85357
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Wed Oct 10 23:40:56 2007
@@ -1645,6 +1645,8 @@
 				nextexp = nextthing;
 				pos = nextexp - whereweare;
 				break;
+			default:
+				pos = 1;
 			}
 		}
 
@@ -1800,8 +1802,7 @@
 				count -= length;
 				cp2 += length;
 			}
-		} else
-			break;
+		}
 	}
 }